zelo72
/
mastodon-ios
mirror of https://github.com/mastodon/mastodon-ios
2
2
Fork 1
Code Issues 19 Releases Wiki Activity

Merge branch 'fix/typo' into release/0.6.1

This commit is contained in:
CMK 2021-06-15 19:32:46 +08:00
parent 65abb60eb9 49b5e12f27
commit a3d858209e
12 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Mastodon.xcodeproj/project.pbxproj
View File

@ -169,7 +169,7 @@
5DDDF1932617442700311060 /* Mastodon+Entity+Account.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DDDF1922617442700311060 /* Mastodon+Entity+Account.swift */; };
5DDDF1992617447F00311060 /* Mastodon+Entity+Tag.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DDDF1982617447F00311060 /* Mastodon+Entity+Tag.swift */; };
5DDDF1A92617489F00311060 /* Mastodon+Entity+History.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DDDF1A82617489F00311060 /* Mastodon+Entity+History.swift */; };
5DF1054125F886D400D6C0D4 /* ViedeoPlaybackService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DF1054025F886D400D6C0D4 /* ViedeoPlaybackService.swift */; };
5DF1054125F886D400D6C0D4 /* VideoPlaybackService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DF1054025F886D400D6C0D4 /* VideoPlaybackService.swift */; };
5DF1054725F8870E00D6C0D4 /* VideoPlayerViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DF1054625F8870E00D6C0D4 /* VideoPlayerViewModel.swift */; };
5DF1056425F887CB00D6C0D4 /* AVPlayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DF1056325F887CB00D6C0D4 /* AVPlayer.swift */; };
5DF1057925F88A1D00D6C0D4 /* PlayerContainerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DF1057825F88A1D00D6C0D4 /* PlayerContainerView.swift */; };
@ -732,7 +732,7 @@
5DDDF1922617442700311060 /* Mastodon+Entity+Account.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Mastodon+Entity+Account.swift"; sourceTree = "<group>"; };
5DDDF1982617447F00311060 /* Mastodon+Entity+Tag.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Mastodon+Entity+Tag.swift"; sourceTree = "<group>"; };
5DDDF1A82617489F00311060 /* Mastodon+Entity+History.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Mastodon+Entity+History.swift"; sourceTree = "<group>"; };
5DF1054025F886D400D6C0D4 /* ViedeoPlaybackService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViedeoPlaybackService.swift; sourceTree = "<group>"; };
5DF1054025F886D400D6C0D4 /* VideoPlaybackService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VideoPlaybackService.swift; sourceTree = "<group>"; };
5DF1054625F8870E00D6C0D4 /* VideoPlayerViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VideoPlayerViewModel.swift; sourceTree = "<group>"; };
5DF1056325F887CB00D6C0D4 /* AVPlayer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AVPlayer.swift; sourceTree = "<group>"; };
5DF1057825F88A1D00D6C0D4 /* PlayerContainerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayerContainerView.swift; sourceTree = "<group>"; };
@ -1343,7 +1343,7 @@
DB4563BC25E11A24004DA0B9 /* KeyboardResponderService.swift */,
2D206B8B25F6015000143C56 /* AudioPlaybackService.swift */,
2DA6054625F716A2006356F9 /* PlaybackState.swift */,
5DF1054025F886D400D6C0D4 /* ViedeoPlaybackService.swift */,
5DF1054025F886D400D6C0D4 /* VideoPlaybackService.swift */,
DB71FD4B25F8C80E00512AE1 /* StatusPrefetchingService.swift */,
DBC7A67B260DFADE00E57475 /* StatusPublishService.swift */,
2D9DB966263A76FB007C1D71 /* BlockDomainService.swift */,
@ -2947,7 +2947,7 @@
DBBF1DC7265251D400E5B703 /* AutoCompleteViewModel+State.swift in Sources */,
DBCC3B9526157E6E0045B23D /* APIService+Relationship.swift in Sources */,
2D7631B325C159F700929FB9 /* Item.swift in Sources */,
5DF1054125F886D400D6C0D4 /* ViedeoPlaybackService.swift in Sources */,
5DF1054125F886D400D6C0D4 /* VideoPlaybackService.swift in Sources */,
DB6B35182601FA3400DC1E11 /* MastodonAttachmentService.swift in Sources */,
0FB3D2F725E4C24D00AAD544 /* MastodonPickServerViewModel.swift in Sources */,
2D61335E25C1894B00CAE157 /* APIService.swift in Sources */,

2
Mastodon.xcworkspace/xcshareddata/swiftpm/Package.resolved
View File

@ -69,7 +69,7 @@
"repositoryURL": "https://github.com/onevcat/Kingfisher.git",
"state": {
"branch": null,
"revision": "15d199e84677303a7004ed2c5ecaa1a90f3863f8",
"revision": "bbc4bc4def7eb05a7ba8e1219f80ee9be327334e",
"version": "6.2.1"
}
},

4
Mastodon/Extension/CoreDataStack/Emojis.swift
View File

@ -8,11 +8,11 @@
import Foundation
import MastodonSDK
protocol EmojiContinaer {
protocol EmojiContainer {
var emojisData: Data? { get }
}
extension EmojiContinaer {
extension EmojiContainer {
static func encode(emojis: [Mastodon.Entity.Emoji]) -> Data? {
return try? JSONEncoder().encode(emojis)

4
Mastodon/Extension/CoreDataStack/Fields.swift
View File

@ -8,11 +8,11 @@
import Foundation
import MastodonSDK
protocol FieldContinaer {
protocol FieldContainer {
var fieldsData: Data? { get }
}
extension FieldContinaer {
extension FieldContainer {
static func encode(fields: [Mastodon.Entity.Field]) -> Data? {
return try? JSONEncoder().encode(fields)

4
Mastodon/Extension/CoreDataStack/MastodonUser.swift
View File

@ -101,5 +101,5 @@ extension MastodonUser {
}
}
extension MastodonUser: EmojiContinaer { }
extension MastodonUser: FieldContinaer { }
extension MastodonUser: EmojiContainer { }
extension MastodonUser: FieldContainer { }

2
Mastodon/Extension/CoreDataStack/Status.swift
View File

@ -88,4 +88,4 @@ extension Status {
}
}
extension Status: EmojiContinaer { }
extension Status: EmojiContainer { }

2
Mastodon/Service/APIService/APIService+Media.swift
View File

@ -13,7 +13,7 @@ extension APIService {
func uploadMedia(
domain: String,
query: Mastodon.API.Media.UploadMeidaQuery,
query: Mastodon.API.Media.UploadMediaQuery,
mastodonAuthenticationBox: AuthenticationService.MastodonAuthenticationBox
) -> AnyPublisher<Mastodon.Response.Content<Mastodon.Entity.Attachment>, Error> {
let authorization = mastodonAuthenticationBox.userAuthorization

2
Mastodon/Service/APIService/APIService+UserTimeline.swift
View File

@ -27,7 +27,7 @@ extension APIService {
) -> AnyPublisher<Mastodon.Response.Content<[Mastodon.Entity.Status]>, Error> {
let authorization = authorizationBox.userAuthorization
let requestMastodonUserID = authorizationBox.userID
let query = Mastodon.API.Account.AccountStatuseseQuery(
let query = Mastodon.API.Account.AccountStatusesQuery(
maxID: maxID,
sinceID: sinceID,
excludeReplies: excludeReplies,

2
Mastodon/Service/MastodonAttachmentService/MastodonAttachmentService+UploadState.swift
View File

@ -56,7 +56,7 @@ extension MastodonAttachmentService.UploadState {
guard let file = service.file.value else { return }
let description = service.description.value
let query = Mastodon.API.Media.UploadMeidaQuery(
let query = Mastodon.API.Media.UploadMediaQuery(
file: file,
thumbnail: nil,
description: description,

0
Mastodon/Service/ViedeoPlaybackService.swift → Mastodon/Service/VideoPlaybackService.swift
View File

6
MastodonSDK/Sources/MastodonSDK/API/Mastodon+API+Account.swift
View File

@ -71,14 +71,14 @@ extension Mastodon.API.Account {
/// - Parameters:
/// - session: `URLSession`
/// - domain: Mastodon instance domain. e.g. "example.com"
/// - query: `AccountStatuseseQuery` with query parameters
/// - query: `AccountStatusesQuery` with query parameters
/// - authorization: User token
/// - Returns: `AnyPublisher` contains `Token` nested in the response
public static func statuses(
session: URLSession,
domain: String,
accountID: Mastodon.Entity.Account.ID,
query: AccountStatuseseQuery,
query: AccountStatusesQuery,
authorization: Mastodon.API.OAuth.Authorization
) -> AnyPublisher<Mastodon.Response.Content<[Mastodon.Entity.Status]>, Error> {
let request = Mastodon.API.get(
@ -94,7 +94,7 @@ extension Mastodon.API.Account {
.eraseToAnyPublisher()
}
public struct AccountStatuseseQuery: GetQuery {
public struct AccountStatusesQuery: GetQuery {
public let maxID: Mastodon.Entity.Status.ID?
public let sinceID: Mastodon.Entity.Status.ID?
public let excludeReplies: Bool? // undocumented

4
MastodonSDK/Sources/MastodonSDK/API/Mastodon+API+Media.swift
View File

@ -33,7 +33,7 @@ extension Mastodon.API.Media {
public static func uploadMedia(
session: URLSession,
domain: String,
query: UploadMeidaQuery,
query: UploadMediaQuery,
authorization: Mastodon.API.OAuth.Authorization?
) -> AnyPublisher<Mastodon.Response.Content<Mastodon.Entity.Attachment>, Error> {
var request = Mastodon.API.post(
@ -56,7 +56,7 @@ extension Mastodon.API.Media {
.eraseToAnyPublisher()
}
public struct UploadMeidaQuery: PostQuery, PutQuery {
public struct UploadMediaQuery: PostQuery, PutQuery {
public let file: Mastodon.Query.MediaAttachment?
public let thumbnail: Mastodon.Query.MediaAttachment?
public let description: String?