Skip to content

Commit

Permalink
refacto(mastodon): achieve comment broadcast with Mastodon.py
Browse files Browse the repository at this point in the history
  • Loading branch information
@Guts
Guts committed Apr 25, 2024
1 parent dc6a7a9 commit fd8580f
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 109 deletions.
16 changes: 2 additions & 14 deletions geotribu_cli/comments/comments_broadcast.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,16 +109,6 @@ def parser_comments_broadcast(
help="Désactive l'ouverture automatique du post à la fin de la commande.",
)

subparser.add_argument(
"--no-public",
"--private",
default=True,
action="store_false",
dest="opt_no_public",
help="Publie le commentaire en mode privé (ne fonctionne pas avec tous les "
"canaux de diffusion).",
)

subparser.set_defaults(func=run)

return subparser
Expand Down Expand Up @@ -164,11 +154,9 @@ def run(args: argparse.Namespace):
if args.broadcast_to == "mastodon":
try:
mastodon_client = ExtendedMastodonClient()
online_post = mastodon_client.broadcast_comment(
in_comment=comment_obj, public=args.opt_no_public
)
online_post = mastodon_client.broadcast_comment(in_comment=comment_obj)
if not online_post:
print(f"le commentaire n'a pas encore été publié : {comment_obj}")
print(f"le commentaire n'a pas encore été publié : {comment_obj.id}")
except Exception as err:
logger.error(
f"La publication du commentaire {comment_obj.id} a échoué. "
Expand Down
111 changes: 16 additions & 95 deletions geotribu_cli/social/mastodon_client.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,12 +187,14 @@ def url_to_instance_domain(cls, url: str) -> str:
parsed_url = urlparse(url)
return parsed_url.netloc

def broadcast_comment(self, in_comment: Comment, public: bool = True) -> dict:
def broadcast_comment(
self,
in_comment: Comment,
) -> dict:
"""Post the latest comment to Mastodon.
Args:
in_comment: comment to broadcast
public: if not, the comment is sent as direct message, so it's not public.
Returns:
URL to posted status
Expand All @@ -218,14 +220,25 @@ def broadcast_comment(self, in_comment: Comment, public: bool = True) -> dict:
f"{comment_parent_broadcasted.get('url')}. Le commentaire "
f"{in_comment.id} actuel sera donc posté en réponse."
)
in_reply_to_id = comment_parent_broadcasted.get("id")
else:
logger.info(
f"Le commentaire parent {in_comment.parent} n'a été posté précédemment "
f"sur Mastodon. Le commentaire actuel ({in_comment.id}) sera donc "
"posté comme nouveau fil de discussion."
)
in_reply_to_id = None

new_status = self.status_post(
status=comment_to_media(in_comment=in_comment, media="mastodon"),
in_reply_to_id=in_reply_to_id,
language="fr",
visibility=getenv("GEOTRIBU_MASTODON_DEFAULT_VISIBILITY", "unlisted"),
)
if isinstance(new_status, dict):
new_status["cli_newly_posted"] = True

return already_broadcasted
return new_status

def comment_already_broadcasted(self, comment_id: int) -> Optional[dict]:
"""Check if comment has already been broadcasted on the media.
Expand Down Expand Up @@ -518,98 +531,6 @@ def export_lists(
# ################################


# def broadcast_to_mastodon(in_comment: Comment, public: bool = True) -> dict:
# """Post the latest comment to Mastodon.

# Args:
# in_comment: comment to broadcast
# public: if not, the comment is sent as direct message, so it's not public.

# Returns:
# URL to posted status
# """
# if getenv("GEOTRIBU_MASTODON_API_ACCESS_TOKEN") is None:
# logger.error(
# "Le jeton d'accès à l'API Mastodon n'a pas été trouvé en variable "
# "d'environnement GEOTRIBU_MASTODON_API_ACCESS_TOKEN. "
# "Le récupérer depuis : https://mapstodon.space/settings/applications/7909"
# )
# return None

# # check if comment has not been already published
# already_broadcasted = comment_already_broadcasted(
# comment_id=in_comment.id, media="mastodon"
# )
# if isinstance(already_broadcasted, dict):
# already_broadcasted["cli_newly_posted"] = False
# return already_broadcasted

# # prepare status
# request_data = {
# "status": comment_to_media(in_comment=in_comment, media="mastodon"),
# "language": "fr",
# }

# # check if parent comment has been posted
# if in_comment.parent is not None:
# comment_parent_broadcasted = comment_already_broadcasted(
# comment_id=in_comment.parent, media="mastodon"
# )
# if (
# isinstance(comment_parent_broadcasted, dict)
# and "id" in comment_parent_broadcasted
# ):
# print(
# f"Le commentaire parent {in_comment.parent}a été posté précédemment sur "
# f"Mastodon : {comment_parent_broadcasted.get('url')}. Le commentaire "
# "actuel sera posté en réponse."
# )
# request_data["in_reply_to_id"] = comment_parent_broadcasted.get("id")
# else:
# print(
# f"Le commentaire parent {in_comment.parent} n'a été posté précédemment "
# f"sur Mastodon. Le commentaire actuel ({in_comment.id}) sera donc posté comme nouveau fil "
# "de discussion."
# )

# # unlisted or direct
# if not public:
# logger.debug("Comment will be posted as DIRECT message.")
# request_data["visibility"] = "direct"
# else:
# logger.debug("Comment will be posted as UNLISTED message.")
# request_data["visibility"] = getenv(
# "GEOTRIBU_MASTODON_DEFAULT_VISIBILITY", "unlisted"
# )

# # json_data = json.dumps(request_data)
# # json_data_bytes = json_data.encode("utf-8") # needs to be bytes

# headers = {
# "User-Agent": f"{__title_clean__}/{__version__}",
# # "Content-Length": len(json_data_bytes),
# # "Content-Type": "application/json; charset=utf-8",
# "Authorization": f"Bearer {getenv('GEOTRIBU_MASTODON_API_ACCESS_TOKEN')}",
# }

# with Session() as post_session:
# post_session.proxies.update(get_proxy_settings())
# post_session.headers.update(headers)

# req = post_session.post(
# url=f"{defaults_settings.mastodon_base_url}api/v1/statuses",
# json=request_data,
# )
# req.raise_for_status()

# content = req.json()

# # set comment as newly posted
# content["cli_newly_posted"] = True

# return content


def comment_to_media(in_comment: Comment, media: str) -> str:
"""Format comment to fit media size and publication rules.
Expand Down

0 comments on commit fd8580f

Please sign in to comment.