Skip to content
This repository was archived by the owner on Jun 29, 2019. It is now read-only.

Commit 498fbab

Browse files
mika-fmika-f
committed
Merge branch feature/1808-marshmallow into develop
2 parents b93fd45 + cdce28f commit 498fbab

File tree

23 files changed

+895
-712
lines changed

23 files changed

+895
-712
lines changed

‎README.md

+21-11
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,25 @@ Orion
44
[![License](https://img.shields.io/github/license/mika-f/orion.svg?longCache=true&style=flat-square)](LICENSE)
55

66

7-
Generic microblogging and social networking services application for Desktop.
7+
Generic fediverse microblogging application for Desktop.
88

99

1010
## Build Statuses
1111

1212
| Platform | Solution | Arch | Status |
1313
| ------------------- | --------------------------------------------- | ------------ | ----------------------------------------------------------------------------------------------------------------------------------------- |
1414
| Windows (Universal) | [Orion-UWP.sln](Source/Orion-UWP.sln) | `x64`, `x86` | [![Build status](https://build.appcenter.ms/v0.1/apps/e222eac7-47e3-4320-b5f6-edcf8a347842/branches/develop/badge)](https://appcenter.ms) |
15-
| Windows (Desktop) | [Orion-Desktop.sln](Source/Orion-Desktop.sln) | `x64` | [![Build status](https://ci.appveyor.com/api/projects/status/ooeh96mepcfrptax/branch/develop?svg=true)](https://ci.appveyor.com) |
16-
| macOS | [Orion-macOS.sln](Source/Orion-macOS.sln) | `x64` | [![Build status](https://img.shields.io/badge/status-unknown-lightgray.svg?longCache=true&style=flat-square)](https://appcenter.ms) |
15+
| Windows (Desktop) | [Orion-Desktop.sln](Source/Orion-Desktop.sln) | `x64` | [![Build status](https://img.shields.io/appveyor/ci/mika-f/Orion/develop.svg?style=flat-square)](https://ci.appveyor.com) |
16+
| macOS | [Orion-macOS.sln](Source/Orion-macOS.sln) | `x64` | [![Build status](https://img.shields.io/badge/build-unknown-lightgray.svg?longCache=true&style=flat-square)](https://appcenter.ms) |
1717

1818

1919
## Services
2020

21-
Orion supports multiple services.
22-
23-
* Twitter
24-
* Mastodon
25-
* GNU Social
21+
Orion supports multiple microblogging services.
2622

2723

2824
## Components
2925

30-
3126
.NET Standard
3227

3328
* Orion.Interfaces
@@ -45,7 +40,22 @@ Xamarin
4540
* Orion.Mac
4641

4742

43+
## Contributing
44+
45+
1. Fork it!
46+
2. Create your feature branch (`git checkout -b feature/foobar`)
47+
3. Commit your changes (`git commit -am'Add some foobar`)
48+
4. Push to the branch (`git push origin feature/foobar`)
49+
5. Create a new Pull Request
50+
51+
4852
## Donation
4953

50-
If you want to support me, you can donate cryptocurrencies here.
51-
https://mochizuki.moe/donation
54+
If this project help you reduce time to develop, you can give me a lunch.
55+
56+
<a href="https://www.patreon.com/mikazuki">
57+
<img src="https://static.mochizuki.moe/become_a_patron_button@2x.png" width="160px">
58+
</a>
59+
60+
Ethereum: `0xC925668E7431d4635Dc9670C934A19c2206b2819`
61+
Monacoin: `MC4x87u1ffmhsRhHof1sHz8UAtNtKCTQut`

‎Scripts/Emoji.linq

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ var shortnames = new List<string>();
1919
var emojiMapping = new StringBuilder();
2020
foreach (var emoji in emojis)
2121
{
22-
var unicode = emoji.Value["unicode_output"].ToString().Split('-').Select(w => $"\\U{w.PadLeft(8, '0')}");
22+
23+
var unicode = (string.IsNullOrWhiteSpace(emoji.Value["unicode_output"].ToString()) ? emoji.Key : emoji.Value["unicode_output"].ToString()).Split('-').Select(w => $"\\U{w.PadLeft(8, '0')}");
2324
emojiMapping.AppendLine($" new Emoji {{ Shortname = \"{ emoji.Value["shortname"] }\", Unicode = \"{ string.Join("", unicode) }\" }},");
2425
shortnames.Add((string) emoji.Value["shortname"]);
2526
if (regex.IsMatch(emoji.Value["shortname"].ToString()) && !shortnames.Contains(emoji.Value["shortname"].ToString().Replace("flag_", "")))

‎Source/Orion-Desktop.sln

-6
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio 15
33
VisualStudioVersion = 15.0.26430.6
44
MinimumVisualStudioVersion = 10.0.40219.1
5-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Orion.Interfaces", "Orion.Interfaces\Orion.Interfaces.csproj", "{04ACFB94-D7CF-4AB1-B521-A3DB1F902C63}"
6-
EndProject
75
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Orion.Shared", "Orion.Shared\Orion.Shared.csproj", "{31647FC1-4A1D-4EE2-B38E-7D514E78ABA7}"
86
EndProject
97
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionItems", "{345A5BD4-9EA0-4B13-9FFE-FC4AFB5449A7}"
@@ -34,10 +32,6 @@ Global
3432
Release|x64 = Release|x64
3533
EndGlobalSection
3634
GlobalSection(ProjectConfigurationPlatforms) = postSolution
37-
{04ACFB94-D7CF-4AB1-B521-A3DB1F902C63}.Debug|x64.ActiveCfg = Debug|Any CPU
38-
{04ACFB94-D7CF-4AB1-B521-A3DB1F902C63}.Debug|x64.Build.0 = Debug|Any CPU
39-
{04ACFB94-D7CF-4AB1-B521-A3DB1F902C63}.Release|x64.ActiveCfg = Release|Any CPU
40-
{04ACFB94-D7CF-4AB1-B521-A3DB1F902C63}.Release|x64.Build.0 = Release|Any CPU
4135
{31647FC1-4A1D-4EE2-B38E-7D514E78ABA7}.Debug|x64.ActiveCfg = Debug|Any CPU
4236
{31647FC1-4A1D-4EE2-B38E-7D514E78ABA7}.Debug|x64.Build.0 = Debug|Any CPU
4337
{31647FC1-4A1D-4EE2-B38E-7D514E78ABA7}.Release|x64.ActiveCfg = Release|Any CPU

‎Source/Orion-UWP.sln

+2-43
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
Microsoft Visual Studio Solution File, Format Version 12.00
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
23
# Visual Studio 15
34
VisualStudioVersion = 15.0.27130.2010
45
MinimumVisualStudioVersion = 10.0.40219.1
@@ -22,116 +23,74 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Orion.Service.Mastodon", "O
2223
EndProject
2324
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Orion.Service.Shared", "Orion.Service.Shared\Orion.Service.Shared.csproj", "{3E4DDFEA-02F0-469E-B09A-2D4480160552}"
2425
EndProject
25-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Orion.Interfaces", "Orion.Interfaces\Orion.Interfaces.csproj", "{D0DE1DF0-66E3-4521-B987-CC91B207729D}"
26-
EndProject
2726
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Orion.Scripting", "Orion.Scripting\Orion.Scripting.csproj", "{1811712F-A06E-49CC-83F0-8E874E959071}"
2827
EndProject
2928
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Orion.Shared", "Orion.Shared\Orion.Shared.csproj", "{6903BAA1-4050-4917-B014-A8E58663F8B3}"
3029
EndProject
3130
Global
3231
GlobalSection(SolutionConfigurationPlatforms) = preSolution
33-
Debug|Any CPU = Debug|Any CPU
3432
Debug|x64 = Debug|x64
3533
Debug|x86 = Debug|x86
36-
Release|Any CPU = Release|Any CPU
3734
Release|x64 = Release|x64
3835
Release|x86 = Release|x86
3936
EndGlobalSection
4037
GlobalSection(ProjectConfigurationPlatforms) = postSolution
41-
{7BFB0EE8-DE4C-4360-B570-E5136A8172E5}.Debug|Any CPU.ActiveCfg = Debug|x64
4238
{7BFB0EE8-DE4C-4360-B570-E5136A8172E5}.Debug|x64.ActiveCfg = Debug|x64
4339
{7BFB0EE8-DE4C-4360-B570-E5136A8172E5}.Debug|x64.Build.0 = Debug|x64
4440
{7BFB0EE8-DE4C-4360-B570-E5136A8172E5}.Debug|x64.Deploy.0 = Debug|x64
4541
{7BFB0EE8-DE4C-4360-B570-E5136A8172E5}.Debug|x86.ActiveCfg = Debug|x86
4642
{7BFB0EE8-DE4C-4360-B570-E5136A8172E5}.Debug|x86.Build.0 = Debug|x86
4743
{7BFB0EE8-DE4C-4360-B570-E5136A8172E5}.Debug|x86.Deploy.0 = Debug|x86
48-
{7BFB0EE8-DE4C-4360-B570-E5136A8172E5}.Release|Any CPU.ActiveCfg = Release|x86
4944
{7BFB0EE8-DE4C-4360-B570-E5136A8172E5}.Release|x64.ActiveCfg = Release|x64
5045
{7BFB0EE8-DE4C-4360-B570-E5136A8172E5}.Release|x64.Build.0 = Release|x64
5146
{7BFB0EE8-DE4C-4360-B570-E5136A8172E5}.Release|x64.Deploy.0 = Release|x64
5247
{7BFB0EE8-DE4C-4360-B570-E5136A8172E5}.Release|x86.ActiveCfg = Release|x86
5348
{7BFB0EE8-DE4C-4360-B570-E5136A8172E5}.Release|x86.Build.0 = Release|x86
5449
{7BFB0EE8-DE4C-4360-B570-E5136A8172E5}.Release|x86.Deploy.0 = Release|x86
55-
{6F32B80B-3DF8-4F60-BD7A-21D7E203D614}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
56-
{6F32B80B-3DF8-4F60-BD7A-21D7E203D614}.Debug|Any CPU.Build.0 = Debug|Any CPU
5750
{6F32B80B-3DF8-4F60-BD7A-21D7E203D614}.Debug|x64.ActiveCfg = Debug|Any CPU
5851
{6F32B80B-3DF8-4F60-BD7A-21D7E203D614}.Debug|x64.Build.0 = Debug|Any CPU
5952
{6F32B80B-3DF8-4F60-BD7A-21D7E203D614}.Debug|x86.ActiveCfg = Debug|Any CPU
6053
{6F32B80B-3DF8-4F60-BD7A-21D7E203D614}.Debug|x86.Build.0 = Debug|Any CPU
61-
{6F32B80B-3DF8-4F60-BD7A-21D7E203D614}.Release|Any CPU.ActiveCfg = Release|Any CPU
62-
{6F32B80B-3DF8-4F60-BD7A-21D7E203D614}.Release|Any CPU.Build.0 = Release|Any CPU
6354
{6F32B80B-3DF8-4F60-BD7A-21D7E203D614}.Release|x64.ActiveCfg = Release|Any CPU
6455
{6F32B80B-3DF8-4F60-BD7A-21D7E203D614}.Release|x64.Build.0 = Release|Any CPU
6556
{6F32B80B-3DF8-4F60-BD7A-21D7E203D614}.Release|x86.ActiveCfg = Release|Any CPU
6657
{6F32B80B-3DF8-4F60-BD7A-21D7E203D614}.Release|x86.Build.0 = Release|Any CPU
67-
{DC8B2787-2A1C-4273-9002-14A8EC7A1E94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
68-
{DC8B2787-2A1C-4273-9002-14A8EC7A1E94}.Debug|Any CPU.Build.0 = Debug|Any CPU
6958
{DC8B2787-2A1C-4273-9002-14A8EC7A1E94}.Debug|x64.ActiveCfg = Debug|Any CPU
7059
{DC8B2787-2A1C-4273-9002-14A8EC7A1E94}.Debug|x64.Build.0 = Debug|Any CPU
7160
{DC8B2787-2A1C-4273-9002-14A8EC7A1E94}.Debug|x86.ActiveCfg = Debug|Any CPU
7261
{DC8B2787-2A1C-4273-9002-14A8EC7A1E94}.Debug|x86.Build.0 = Debug|Any CPU
73-
{DC8B2787-2A1C-4273-9002-14A8EC7A1E94}.Release|Any CPU.ActiveCfg = Release|Any CPU
74-
{DC8B2787-2A1C-4273-9002-14A8EC7A1E94}.Release|Any CPU.Build.0 = Release|Any CPU
7562
{DC8B2787-2A1C-4273-9002-14A8EC7A1E94}.Release|x64.ActiveCfg = Release|Any CPU
7663
{DC8B2787-2A1C-4273-9002-14A8EC7A1E94}.Release|x64.Build.0 = Release|Any CPU
7764
{DC8B2787-2A1C-4273-9002-14A8EC7A1E94}.Release|x86.ActiveCfg = Release|Any CPU
7865
{DC8B2787-2A1C-4273-9002-14A8EC7A1E94}.Release|x86.Build.0 = Release|Any CPU
79-
{49775FDE-8AC9-43CE-901B-1F2E7399D8F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
80-
{49775FDE-8AC9-43CE-901B-1F2E7399D8F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
8166
{49775FDE-8AC9-43CE-901B-1F2E7399D8F6}.Debug|x64.ActiveCfg = Debug|Any CPU
8267
{49775FDE-8AC9-43CE-901B-1F2E7399D8F6}.Debug|x64.Build.0 = Debug|Any CPU
8368
{49775FDE-8AC9-43CE-901B-1F2E7399D8F6}.Debug|x86.ActiveCfg = Debug|Any CPU
8469
{49775FDE-8AC9-43CE-901B-1F2E7399D8F6}.Debug|x86.Build.0 = Debug|Any CPU
85-
{49775FDE-8AC9-43CE-901B-1F2E7399D8F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
86-
{49775FDE-8AC9-43CE-901B-1F2E7399D8F6}.Release|Any CPU.Build.0 = Release|Any CPU
8770
{49775FDE-8AC9-43CE-901B-1F2E7399D8F6}.Release|x64.ActiveCfg = Release|Any CPU
8871
{49775FDE-8AC9-43CE-901B-1F2E7399D8F6}.Release|x64.Build.0 = Release|Any CPU
8972
{49775FDE-8AC9-43CE-901B-1F2E7399D8F6}.Release|x86.ActiveCfg = Release|Any CPU
9073
{49775FDE-8AC9-43CE-901B-1F2E7399D8F6}.Release|x86.Build.0 = Release|Any CPU
91-
{3E4DDFEA-02F0-469E-B09A-2D4480160552}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
92-
{3E4DDFEA-02F0-469E-B09A-2D4480160552}.Debug|Any CPU.Build.0 = Debug|Any CPU
9374
{3E4DDFEA-02F0-469E-B09A-2D4480160552}.Debug|x64.ActiveCfg = Debug|Any CPU
9475
{3E4DDFEA-02F0-469E-B09A-2D4480160552}.Debug|x64.Build.0 = Debug|Any CPU
9576
{3E4DDFEA-02F0-469E-B09A-2D4480160552}.Debug|x86.ActiveCfg = Debug|Any CPU
9677
{3E4DDFEA-02F0-469E-B09A-2D4480160552}.Debug|x86.Build.0 = Debug|Any CPU
97-
{3E4DDFEA-02F0-469E-B09A-2D4480160552}.Release|Any CPU.ActiveCfg = Release|Any CPU
98-
{3E4DDFEA-02F0-469E-B09A-2D4480160552}.Release|Any CPU.Build.0 = Release|Any CPU
9978
{3E4DDFEA-02F0-469E-B09A-2D4480160552}.Release|x64.ActiveCfg = Release|Any CPU
10079
{3E4DDFEA-02F0-469E-B09A-2D4480160552}.Release|x64.Build.0 = Release|Any CPU
10180
{3E4DDFEA-02F0-469E-B09A-2D4480160552}.Release|x86.ActiveCfg = Release|Any CPU
10281
{3E4DDFEA-02F0-469E-B09A-2D4480160552}.Release|x86.Build.0 = Release|Any CPU
103-
{D0DE1DF0-66E3-4521-B987-CC91B207729D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
104-
{D0DE1DF0-66E3-4521-B987-CC91B207729D}.Debug|Any CPU.Build.0 = Debug|Any CPU
105-
{D0DE1DF0-66E3-4521-B987-CC91B207729D}.Debug|x64.ActiveCfg = Debug|Any CPU
106-
{D0DE1DF0-66E3-4521-B987-CC91B207729D}.Debug|x64.Build.0 = Debug|Any CPU
107-
{D0DE1DF0-66E3-4521-B987-CC91B207729D}.Debug|x86.ActiveCfg = Debug|Any CPU
108-
{D0DE1DF0-66E3-4521-B987-CC91B207729D}.Debug|x86.Build.0 = Debug|Any CPU
109-
{D0DE1DF0-66E3-4521-B987-CC91B207729D}.Release|Any CPU.ActiveCfg = Release|Any CPU
110-
{D0DE1DF0-66E3-4521-B987-CC91B207729D}.Release|Any CPU.Build.0 = Release|Any CPU
111-
{D0DE1DF0-66E3-4521-B987-CC91B207729D}.Release|x64.ActiveCfg = Release|Any CPU
112-
{D0DE1DF0-66E3-4521-B987-CC91B207729D}.Release|x64.Build.0 = Release|Any CPU
113-
{D0DE1DF0-66E3-4521-B987-CC91B207729D}.Release|x86.ActiveCfg = Release|Any CPU
114-
{D0DE1DF0-66E3-4521-B987-CC91B207729D}.Release|x86.Build.0 = Release|Any CPU
115-
{1811712F-A06E-49CC-83F0-8E874E959071}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
116-
{1811712F-A06E-49CC-83F0-8E874E959071}.Debug|Any CPU.Build.0 = Debug|Any CPU
11782
{1811712F-A06E-49CC-83F0-8E874E959071}.Debug|x64.ActiveCfg = Debug|Any CPU
11883
{1811712F-A06E-49CC-83F0-8E874E959071}.Debug|x64.Build.0 = Debug|Any CPU
11984
{1811712F-A06E-49CC-83F0-8E874E959071}.Debug|x86.ActiveCfg = Debug|Any CPU
12085
{1811712F-A06E-49CC-83F0-8E874E959071}.Debug|x86.Build.0 = Debug|Any CPU
121-
{1811712F-A06E-49CC-83F0-8E874E959071}.Release|Any CPU.ActiveCfg = Release|Any CPU
122-
{1811712F-A06E-49CC-83F0-8E874E959071}.Release|Any CPU.Build.0 = Release|Any CPU
12386
{1811712F-A06E-49CC-83F0-8E874E959071}.Release|x64.ActiveCfg = Release|Any CPU
12487
{1811712F-A06E-49CC-83F0-8E874E959071}.Release|x64.Build.0 = Release|Any CPU
12588
{1811712F-A06E-49CC-83F0-8E874E959071}.Release|x86.ActiveCfg = Release|Any CPU
12689
{1811712F-A06E-49CC-83F0-8E874E959071}.Release|x86.Build.0 = Release|Any CPU
127-
{6903BAA1-4050-4917-B014-A8E58663F8B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
128-
{6903BAA1-4050-4917-B014-A8E58663F8B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
12990
{6903BAA1-4050-4917-B014-A8E58663F8B3}.Debug|x64.ActiveCfg = Debug|Any CPU
13091
{6903BAA1-4050-4917-B014-A8E58663F8B3}.Debug|x64.Build.0 = Debug|Any CPU
13192
{6903BAA1-4050-4917-B014-A8E58663F8B3}.Debug|x86.ActiveCfg = Debug|Any CPU
13293
{6903BAA1-4050-4917-B014-A8E58663F8B3}.Debug|x86.Build.0 = Debug|Any CPU
133-
{6903BAA1-4050-4917-B014-A8E58663F8B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
134-
{6903BAA1-4050-4917-B014-A8E58663F8B3}.Release|Any CPU.Build.0 = Release|Any CPU
13594
{6903BAA1-4050-4917-B014-A8E58663F8B3}.Release|x64.ActiveCfg = Release|Any CPU
13695
{6903BAA1-4050-4917-B014-A8E58663F8B3}.Release|x64.Build.0 = Release|Any CPU
13796
{6903BAA1-4050-4917-B014-A8E58663F8B3}.Release|x86.ActiveCfg = Release|Any CPU

‎Source/Orion.Interfaces/Class1.cs

-8
This file was deleted.

‎Source/Orion.Interfaces/Orion.Interfaces.csproj

-7
This file was deleted.

‎Source/Orion.Scripting/Orion.Scripting.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard1.4</TargetFramework>
4+
<TargetFramework>netstandard2.0</TargetFramework>
55
</PropertyGroup>
66

77
</Project>

‎Source/Orion.Service.FkStreaming/Orion.Service.FkStreaming.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard1.4</TargetFramework>
4+
<TargetFramework>netstandard2.0</TargetFramework>
55
</PropertyGroup>
66

77
</Project>

‎Source/Orion.Service.GnuSocial/Orion.Service.GnuSocial.csproj

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard1.4</TargetFramework>
4+
<TargetFramework>netstandard2.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
@@ -12,4 +12,8 @@
1212
<Folder Include="Clients\StatusNet\" />
1313
</ItemGroup>
1414

15+
<ItemGroup>
16+
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
17+
</ItemGroup>
18+
1519
</Project>

‎Source/Orion.Service.Mastodon/Orion.Service.Mastodon.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard1.4</TargetFramework>
4+
<TargetFramework>netstandard2.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
8+
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
99
</ItemGroup>
1010

1111
<ItemGroup>

‎Source/Orion.Service.Shared/Orion.Service.Shared.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard1.4</TargetFramework>
4+
<TargetFramework>netstandard2.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
8+
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
99
</ItemGroup>
1010

1111
</Project>

‎Source/Orion.Shared/Absorb/Clients/MastodonClientWrapper.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace Orion.Shared.Absorb.Clients
1010
{
1111
public class MastodonClientWrapper : BaseClientWrapper
1212
{
13-
private const string RedirectUri = "https://kokoiroworks.com/callback";
13+
private const string RedirectUri = "https://static.mochizuki.moe/callback";
1414
private readonly MastodonClient _mastodonClient;
1515

1616
public MastodonClientWrapper(Provider provider, Credential credential) : base(provider, credential)
@@ -28,7 +28,7 @@ public MastodonClientWrapper(Provider provider, Credential credential) : base(pr
2828
public override async Task<string> GetAuthorizedUrlAsync()
2929
{
3030
const Scope scopes = Scope.Read | Scope.Write | Scope.Follow;
31-
await _mastodonClient.Apps.RegisterAsync("Orion", RedirectUri, scopes, "https://ori.kokoiroworks.com");
31+
await _mastodonClient.Apps.RegisterAsync("Orion", RedirectUri, scopes, "https://orion.mochizuki.moe");
3232
return _mastodonClient.OAuth.GetAuthorizeUrl(scopes, RedirectUri);
3333
}
3434

0 commit comments

Comments
 (0)