Mastodon
/
Toot-Mastodon-CLI-TUI-client-Linux
mirror of https://github.com/ihabunek/toot
1
0
Fork 0
Code Issues Releases Wiki Activity

Added toot timeline --account_tl console command 

Displays the timeline of any account (public timeline for
users who are not you, public+private for you)

Right now it does not display reblogs or replies,
this could be configurable if we add more command line flags
This commit is contained in:
Daniel Schwarz 2023-05-17 20:23:46 -04:00 committed by Ivan Habunek
parent 4df2abf5cd
commit e55474158a
No known key found for this signature in database
GPG Key ID: F5F0623FF5EBCB3D
3 changed files with 55 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
toot/api.py
View File

@ -10,9 +10,33 @@ from toot import App, User, http, CLIENT_NAME, CLIENT_WEBSITE
from toot.exceptions import AuthenticationError, ConsoleError
from toot.utils import drop_empty_values, str_bool, str_bool_nullable
SCOPES = 'read write follow'
def find_account(app, user, account_name):
if not account_name:
raise ConsoleError("Empty account name given")
normalized_name = account_name.lstrip("@").lower()
# Strip @<instance_name> from accounts on the local instance. The `acct`
# field in account object contains the qualified name for users of other
# instances, but only the username for users of the local instance. This is
# required in order to match the account name below.
if "@" in normalized_name:
[username, instance] = normalized_name.split("@", maxsplit=1)
if instance == app.instance:
normalized_name = username
response = search(app, user, account_name, type="accounts", resolve=True)
for account in response["accounts"]:
if account["acct"].lower() == normalized_name:
return account
raise ConsoleError("Account not found")
def _account_action(app, user, account, action):
url = f"/api/v1/accounts/{account}/{action}"
return http.post(app, user, url).json()
@ -350,6 +374,13 @@ def conversation_timeline_generator(app, user, limit=20):
return _conversation_timeline_generator(app, user, path, params)
def account_timeline_generator(app: App, user: User, account_name: str, replies=False, reblogs=False, limit=20):
account = find_account(app, user, account_name)
path = f"/api/v1/accounts/{account['id']}/statuses"
params = {"limit": limit, "exclude_replies": not replies, "exclude_reblogs": not reblogs}
return _timeline_generator(app, user, path, params)
def timeline_list_generator(app, user, list_id, limit=20):
path = f"/api/v1/timelines/list/{list_id}"
return _timeline_generator(app, user, path, {'limit': limit})

51
toot/commands.py
View File

@ -16,8 +16,8 @@ from toot.utils import args_get_instance, delete_tmp_status_file, editor_input,
def get_timeline_generator(app, user, args):
# Make sure tag, list and public are not used simultaneously
if len([arg for arg in [args.tag, args.list, args.public] if arg]) > 1:
raise ConsoleError("Only one of --public, --tag, or --list can be used at one time.")
if len([arg for arg in [args.tag, args.list, args.public, args.account_tl] if arg]) > 1:
raise ConsoleError("Only one of --public, --tag, --account_tl, or --list can be used at one time.")
if args.local and not (args.public or args.tag):
raise ConsoleError("The --local option is only valid alongside --public or --tag.")
@ -35,6 +35,8 @@ def get_timeline_generator(app, user, args):
return api.anon_tag_timeline_generator(args.instance, args.tag, limit=args.count)
else:
return api.tag_timeline_generator(app, user, args.tag, local=args.local, limit=args.count)
elif args.account_tl:
return api.account_timeline_generator(app, user, args.account, limit=args.count)
elif args.list:
return api.timeline_list_generator(app, user, args.list, limit=args.count)
else:
@ -360,49 +362,26 @@ def _do_upload(app, user, file, description, thumbnail):
return api.upload_media(app, user, file, description=description, thumbnail=thumbnail)
def find_account(app, user, account_name):
if not account_name:
raise ConsoleError("Empty account name given")
normalized_name = account_name.lstrip("@").lower()
# Strip @<instance_name> from accounts on the local instance. The `acct`
# field in account object contains the qualified name for users of other
# instances, but only the username for users of the local instance. This is
# required in order to match the account name below.
if "@" in normalized_name:
[username, instance] = normalized_name.split("@", maxsplit=1)
if instance == app.instance:
normalized_name = username
response = api.search(app, user, account_name, type="accounts", resolve=True)
for account in response["accounts"]:
if account["acct"].lower() == normalized_name:
return account
raise ConsoleError("Account not found")
def follow(app, user, args):
account = find_account(app, user, args.account)
account = api.find_account(app, user, args.account)
api.follow(app, user, account['id'])
print_out("<green>✓ You are now following {}</green>".format(args.account))
def unfollow(app, user, args):
account = find_account(app, user, args.account)
account = api.find_account(app, user, args.account)
api.unfollow(app, user, account['id'])
print_out("<green>✓ You are no longer following {}</green>".format(args.account))
def following(app, user, args):
account = find_account(app, user, args.account)
account = api.find_account(app, user, args.account)
response = api.following(app, user, account['id'])
print_acct_list(response)
def followers(app, user, args):
account = find_account(app, user, args.account)
account = api.find_account(app, user, args.account)
response = api.followers(app, user, account['id'])
print_acct_list(response)
@ -452,7 +431,7 @@ def list_delete(app, user, args):
def list_add(app, user, args):
list_id = _get_list_id(app, user, args)
account = find_account(app, user, args.account)
account = api.find_account(app, user, args.account)
try:
api.add_accounts_to_list(app, user, list_id, [account['id']])
@ -477,7 +456,7 @@ def list_add(app, user, args):
def list_remove(app, user, args):
list_id = _get_list_id(app, user, args)
account = find_account(app, user, args.account)
account = api.find_account(app, user, args.account)
api.remove_accounts_from_list(app, user, list_id, [account['id']])
print_out(f"<green>✓ Removed account \"{args.account}\"</green>")
@ -490,25 +469,25 @@ def _get_list_id(app, user, args):
def mute(app, user, args):
account = find_account(app, user, args.account)
account = api.find_account(app, user, args.account)
api.mute(app, user, account['id'])
print_out("<green>✓ You have muted {}</green>".format(args.account))
def unmute(app, user, args):
account = find_account(app, user, args.account)
account = api.find_account(app, user, args.account)
api.unmute(app, user, account['id'])
print_out("<green>✓ {} is no longer muted</green>".format(args.account))
def block(app, user, args):
account = find_account(app, user, args.account)
account = api.find_account(app, user, args.account)
api.block(app, user, account['id'])
print_out("<green>✓ You are now blocking {}</green>".format(args.account))
def unblock(app, user, args):
account = find_account(app, user, args.account)
account = api.find_account(app, user, args.account)
api.unblock(app, user, account['id'])
print_out("<green>✓ {} is no longer blocked</green>".format(args.account))
@ -519,7 +498,7 @@ def whoami(app, user, args):
def whois(app, user, args):
account = find_account(app, user, args.account)
account = api.find_account(app, user, args.account)
print_account(account)

9
toot/console.py
View File

@ -238,6 +238,11 @@ common_timeline_args = [
"type": str,
"help": "show hashtag timeline (does not require auth)",
}),
(["-at", "--account_tl"], {
"action": "store_true",
"default": False,
"help": "show account timeline (requires account name)",
}),
(["-l", "--local"], {
"action": "store_true",
"default": False,
@ -251,6 +256,10 @@ common_timeline_args = [
"type": str,
"help": "show timeline for given list.",
}),
(["account"], {
"nargs": "?",
"help": "account name, e.g. 'Gargron@mastodon.social'",
}),
]
timeline_and_bookmark_args = [