No OneTemporary
Actions

Size

7 KB

Subscribers

None

View Options

	diff --git a/macOS/Navigation/ActivePostToolbarView.swift b/macOS/Navigation/ActivePostToolbarView.swift
	index 9fb6fca..5267b07 100644
	--- a/macOS/Navigation/ActivePostToolbarView.swift
	+++ b/macOS/Navigation/ActivePostToolbarView.swift
	@@ -1,154 +1,153 @@
	import SwiftUI

	struct ActivePostToolbarView: View {
	@EnvironmentObject var model: WriteFreelyModel
	@ObservedObject var activePost: WFAPost
	@State private var isPresentingSharingServicePicker: Bool = false
	@State private var selectedCollection: WFACollection?

	@FetchRequest(
	entity: WFACollection.entity(),
	sortDescriptors: [NSSortDescriptor(keyPath: \WFACollection.title, ascending: true)]
	) var collections: FetchedResults<WFACollection>

	var body: some View {
	HStack {
	if model.account.isLoggedIn &&
	activePost.status != PostStatus.local.rawValue &&
	!(activePost.wasDeletedFromServer \|\| activePost.hasNewerRemoteCopy) {
	Section(header: Text("Move To:")) {
	Picker(selection: $selectedCollection, label: Text("Move To…"), content: {
	Text("\(model.account.server == "https://write.as" ? "Anonymous" : "Drafts")")
	.tag(nil as WFACollection?)
	Divider()
	ForEach(collections) { collection in
	Text("\(collection.title)").tag(collection as WFACollection?)
	}
	})
	}
	}
	PostEditorStatusToolbarView(post: activePost)
	.frame(minWidth: 50, alignment: .center)
	.layoutPriority(1)
	.padding(.horizontal)
	if activePost.status == PostStatus.edited.rawValue {
	Button(action: {
	+ activePost.hasNewerRemoteCopy = true
	model.editor.postToUpdate = activePost
	model.updateFromServer(post: activePost)
	- DispatchQueue.main.async {
	- model.selectedPost = nil
	- }
	+ model.selectedPost = nil
	}, label: {
	Image(systemName: "clock.arrow.circlepath")
	.accessibilityLabel(Text("Revert post"))
	.accessibilityHint(Text("Replace the edited post with the published version from the server"))
	})
	}
	if activePost.status == PostStatus.local.rawValue {
	Menu(content: {
	Label("Publish To:", systemImage: "paperplane")
	Divider()
	Button(action: {
	if model.account.isLoggedIn {
	withAnimation {
	activePost.collectionAlias = nil
	publishPost(activePost)
	}
	} else {
	openSettingsWindow()
	}
	}, label: {
	Text("\(model.account.server == "https://write.as" ? "Anonymous" : "Drafts")")
	})
	ForEach(collections) { collection in
	Button(action: {
	if model.account.isLoggedIn {
	withAnimation {
	activePost.collectionAlias = collection.alias
	publishPost(activePost)
	}
	} else {
	openSettingsWindow()
	}
	}, label: {
	Text("\(collection.title)")
	})
	}
	}, label: {
	Label("Publish…", systemImage: "paperplane")
	})
	.disabled(model.selectedPost?.body.isEmpty ?? true)
	.help("Publish the post to the web.\(model.account.isLoggedIn ? "" : " You must be logged in to do this.")") // swiftlint:disable:this line_length
	} else {
	HStack(spacing: 4) {
	Button(
	action: {
	self.isPresentingSharingServicePicker = true
	},
	label: { Image(systemName: "square.and.arrow.up") }
	)
	.disabled(activePost.status == PostStatus.local.rawValue)
	.help("Copy the post's URL to your Mac's pasteboard.")
	.background(
	PostEditorSharingPicker(
	isPresented: $isPresentingSharingServicePicker,
	sharingItems: createPostUrl()
	)
	)
	Button(action: { publishPost(activePost) }, label: { Image(systemName: "paperplane") })
	.disabled(activePost.body.isEmpty \|\| activePost.status == PostStatus.published.rawValue)
	.help("Publish the post to the web.\(model.account.isLoggedIn ? "" : " You must be logged in to do this.")") // swiftlint:disable:this line_length
	}
	}
	}
	.onAppear(perform: {
	self.selectedCollection = collections.first { $0.alias == activePost.collectionAlias }
	})
	.onChange(of: selectedCollection, perform: { [selectedCollection] newCollection in
	if activePost.collectionAlias == newCollection?.alias {
	return
	} else {
	withAnimation {
	activePost.collectionAlias = newCollection?.alias
	model.move(post: activePost, from: selectedCollection, to: newCollection)
	}
	}
	})
	}

	private func createPostUrl() -> [NSURL] {
	guard let postId = model.selectedPost?.postId else { return [] }

	var urlString: String

	if let postSlug = model.selectedPost?.slug,
	let postCollectionAlias = model.selectedPost?.collectionAlias {
	// This post is in a collection, so share the URL as baseURL/postSlug
	let urls = collections.filter { $0.alias == postCollectionAlias }
	let baseURL = urls.first?.url ?? "\(model.account.server)/\(postCollectionAlias)/"
	urlString = "\(baseURL)\(postSlug)"
	} else {
	// This is a draft post, so share the URL as server/postID
	urlString = "\(model.account.server)/\(postId)"
	}

	guard let data = URL(string: urlString) else { return [] }
	return [data as NSURL]
	}

	private func publishPost(_ post: WFAPost) {
	if post != model.selectedPost {
	return
	}
	DispatchQueue.main.async {
	LocalStorageManager.standard.saveContext()
	model.publish(post: post)
	}
	model.editor.setInitialValues(for: post)
	}

	private func openSettingsWindow() {
	guard let menuItem = NSApplication.shared.mainMenu?.item(at: 0)?.submenu?.item(at: 2) else { return }
	NSApplication.shared.sendAction(menuItem.action!, to: menuItem.target, from: nil)
	}
	}

File Metadata

Mime Type: text/x-diff
Expires: Thu, Jul 17, 7:21 PM (7 h, 21 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 3324282

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions