-
-
Notifications
You must be signed in to change notification settings - Fork 265
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Make list of default servers configurable (IOS-171)
- Loading branch information
Showing
10 changed files
with
135 additions
and
31 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -530,7 +530,7 @@ uploaded to Mastodon."; | |
"Scene.Welcome.Education.Mastodon.Title" = "Welcome to Mastodon"; | ||
"Scene.Welcome.Education.Servers.Description" = "Every Mastodon account is hosted on a server — each with its own values, rules, & admins. No matter which one you pick, you can follow and interact with people on any server."; | ||
"Scene.Welcome.Education.Servers.Title" = "What are servers?"; | ||
"Scene.Welcome.JoinDefaultServer" = "Join mastodon.social"; | ||
"Scene.Welcome.JoinDefaultServer" = "Join %@"; | ||
"Scene.Welcome.LearnMore" = "Learn more"; | ||
"Scene.Welcome.LogIn" = "Log In"; | ||
"Scene.Welcome.PickServer" = "Pick another server"; | ||
|
@@ -556,4 +556,4 @@ uploaded to Mastodon."; | |
"Widget.MultipleFollowers.ConfigurationDescription" = "Show number of followers for multiple accounts."; | ||
"Widget.MultipleFollowers.ConfigurationDisplayName" = "Multiple followers"; | ||
"Widget.MultipleFollowers.MockUser.AccountName" = "[email protected]"; | ||
"Widget.MultipleFollowers.MockUser.DisplayName" = "Another follower"; | ||
"Widget.MultipleFollowers.MockUser.DisplayName" = "Another follower"; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -530,7 +530,7 @@ uploaded to Mastodon."; | |
"Scene.Welcome.Education.Mastodon.Title" = "Welcome to Mastodon"; | ||
"Scene.Welcome.Education.Servers.Description" = "Every Mastodon account is hosted on a server — each with its own values, rules, & admins. No matter which one you pick, you can follow and interact with people on any server."; | ||
"Scene.Welcome.Education.Servers.Title" = "What are servers?"; | ||
"Scene.Welcome.JoinDefaultServer" = "Join mastodon.social"; | ||
"Scene.Welcome.JoinDefaultServer" = "Join %@"; | ||
"Scene.Welcome.LearnMore" = "Learn more"; | ||
"Scene.Welcome.LogIn" = "Log In"; | ||
"Scene.Welcome.PickServer" = "Pick another server"; | ||
|
@@ -556,4 +556,4 @@ uploaded to Mastodon."; | |
"Widget.MultipleFollowers.ConfigurationDescription" = "Show number of followers for multiple accounts."; | ||
"Widget.MultipleFollowers.ConfigurationDisplayName" = "Multiple followers"; | ||
"Widget.MultipleFollowers.MockUser.AccountName" = "[email protected]"; | ||
"Widget.MultipleFollowers.MockUser.DisplayName" = "Another follower"; | ||
"Widget.MultipleFollowers.MockUser.DisplayName" = "Another follower"; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 15 additions & 0 deletions
15
MastodonSDK/Sources/MastodonSDK/Entity/Mastodon+Entity+DefaultServer.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
// Copyright © 2023 Mastodon gGmbH. All rights reserved. | ||
|
||
import Foundation | ||
|
||
extension Mastodon.Entity { | ||
public struct DefaultServer: Codable { | ||
public let domain: String | ||
public let weight: Int | ||
|
||
public init(domain: String, weight: Int) { | ||
self.domain = domain | ||
self.weight = weight | ||
} | ||
} | ||
} |