branch: elpa/mastodon
commit b2c874258da362785d3d12b7e2b42b071d687199
Author: marty hiatt <[email protected]>
Commit: marty hiatt <[email protected]>
add action arg to mastodon-toot--str-negify
---
lisp/mastodon-toot.el | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 6d9295f6d9..2ddc24a50b 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -440,9 +440,11 @@ ACTION is a symbol, either `favourite' or `boost.'"
(faved (when byline-region
(get-text-property (car byline-region) 'favourited-p)))
(str-api (if boost-p "reblog" action-str))
- (action-str-api (mastodon-toot--str-negify str-api faved
boosted))
+ (action-str-api (mastodon-toot--str-negify str-api faved boosted
+ action))
(action-pp (concat
- (mastodon-toot--str-negify action-str faved boosted)
+ (mastodon-toot--str-negify action-str faved boosted
+ action)
(if boost-p "ed" "d")))
(remove-p (if boost-p boosted faved)))
(mastodon-toot--action
@@ -459,11 +461,14 @@ ACTION is a symbol, either `favourite' or `boost.'"
byline-region remove-p item-json))
(message "%s #%s" action-pp id)))))))))
-(defun mastodon-toot--str-negify (str faved boosted)
- "Add \"un\" to STR if FAVED or BOOSTED is non-nil."
- (if (or faved boosted)
- (concat "un" str)
- str))
+(defun mastodon-toot--str-negify (str faved boosted action)
+ "Add \"un\" to STR if item is already FAVED or BOOSTED.
+ACTION is the action currently being taken."
+ (if (eq action 'boost)
+ (if boosted (concat "un" str) str)
+ (if faved
+ (concat "un" str)
+ str)))
(defun mastodon-toot--update-stats-on-action (action &optional subtract)
"Increment the toot stats display upon ACTION.
