Skip to content

Commit

Permalink
default cmd
Browse files Browse the repository at this point in the history
  • Loading branch information
yindaheng98 committed Jan 3, 2024
1 parent 6a45049 commit c61ad38
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 10 deletions.
2 changes: 1 addition & 1 deletion citation_rabbot/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from .jumps import *
default_jumps_name = [
"author_papers_jump", "citations_jump", "references_jump", "search_by_title_jump", "paper_detail_jump",
"add_favorite_paper_jump", "rm_favorite_paper_jump",
"add_favorite_paper_jump", "show_favorite_paper_jump", "rm_favorite_paper_jump",
"add_favorite_keywords_jump", "show_favorite_keywords_jump", "rm_favorite_keywords_jump"
]
default_jumps = [eval(name) for name in default_jumps_name]
Expand Down
4 changes: 2 additions & 2 deletions citation_rabbot/jumps/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from .papers import author_papers_jump, citations_jump, references_jump
from .search import search_by_title_jump
from .detail import paper_detail_jump
from .favorites import add_favorite_paper_jump, rm_favorite_paper_jump
from .favorites import add_favorite_keywords_jump, show_favorite_keywords_jump, rm_favorite_keywords_jump
from .favorites import add_favorite_paper_jump, show_favorite_paper_jump, rm_favorite_paper_jump
from .favorites import add_favorite_keywords_jump, show_favorite_keywords_jump, rm_favorite_keywords_jump
26 changes: 24 additions & 2 deletions citation_rabbot/jumps/favorites.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
import os
import json
from telegram import InlineKeyboardButton
from .papers_args import add_arguments_papers
from .papers_args import add_arguments_papers, parse_args_papers
from .papers_display import papers_results2message

favorites_dirname = os.environ['RABBOT_FAVORITE_DIR'] if 'RABBOT_FAVORITE_DIR' in os.environ else "save/favorites"

Expand Down Expand Up @@ -88,6 +89,27 @@ def rm_favorite_paper_results2message(res, args: object):
)


def favorite_paper_args2querys(args: object):
pwhere, jwhere, orderby, limits, values = parse_args_papers(args)
return [(
f"MATCH (p:Publication) WHERE {pwhere} " +
("OPTIONAL MATCH (p:Publication)-[:PUBLISH]->(j:Journal) " if jwhere == '' else f"MATCH (p:Publication)-[:PUBLISH]->(j:Journal) WHERE {jwhere} ") +
f"OPTIONAL MATCH (c:Publication)-[:CITE]->(p:Publication) "
f"OPTIONAL MATCH (r:Publication)<-[:CITE]-(p:Publication) "
f"RETURN p, j, COUNT(DISTINCT c) AS citation, COUNT(DISTINCT r) AS reference ORDER BY {orderby} LIMIT {limits}",
{**values}
)]


show_favorite_paper_jump = (
"show_favorite_paper",
add_arguments_papers,
favorite_paper_args2querys,
papers_results2message,
("Show my favorite papers", "-o date")
)


def add_favorite_keywords_args2querys(args: object):
username = args.update.message.from_user.username
favorites_keywords_path = os.path.join(favorites_dirname, username, "keywords")
Expand Down Expand Up @@ -133,7 +155,7 @@ def show_favorite_keywords_results2message(_, args: object):
None,
lambda _: [(f"RETURN true", {})],
show_favorite_keywords_results2message,
"Show my favorite keywords"
("Show my favorite keywords", "")
)


Expand Down
11 changes: 7 additions & 4 deletions citation_rabbot/start.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,13 @@ def start_args2querys(_) -> List[Tuple[str, Dict]]:


def gen_start_results2message(names, desc_dict):
keyboards = [
[InlineKeyboardButton(desc_dict[name], switch_inline_query_current_chat=f"/{name} -h")]
for name in names
]
keyboards = []
for name in names:
desc = desc_dict[name]
cmd = "-h"
if isinstance(desc, tuple):
desc, cmd = desc
keyboards.append([InlineKeyboardButton(desc, switch_inline_query_current_chat=f"/{name} {cmd}")])

def start_results2message(res: List, _):
msg = "I'm jumping! Here is the places I'm jumping:\n"
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

setup(
name='citation-rabbot',
version='3.12.4',
version='3.12.5',
author='yindaheng98',
author_email='[email protected]',
url='https://github.com/yindaheng98/citation-rabbot',
Expand Down

0 comments on commit c61ad38

Please sign in to comment.