Merge remote-tracking branch 'origin/master' into log-websocket-connection
This commit is contained in:
commit
fac1e46859
|
@ -32,6 +32,10 @@ user = auto
|
|||
# address bar while you have that list open)
|
||||
list = 1
|
||||
|
||||
# Allow replies to be boosted as well
|
||||
# By default replies will be ignores unless it's a reply to your post
|
||||
# replies_to_other_accounts_should_not_be_skipped = yes
|
||||
|
||||
# Should we automatically reconnect to the streaming socket?
|
||||
# That option exists because it's not really a big deal when crossposter runs
|
||||
# as a service and restarts automatically by the service manager.
|
||||
|
|
|
@ -12,6 +12,7 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
"""
|
||||
|
||||
from asyncio import gather
|
||||
from configparser import ConfigParser
|
||||
from logging import getLogger
|
||||
|
|
|
@ -64,6 +64,7 @@ async def listen(
|
|||
source: Callable[..., AsyncGenerator[Status, None]],
|
||||
drains: List[FilteredIntegration],
|
||||
user: str,
|
||||
replies_to_other_accounts_should_not_be_skipped: bool = False,
|
||||
/,
|
||||
**kwargs,
|
||||
):
|
||||
|
@ -93,7 +94,7 @@ async def listen(
|
|||
if (
|
||||
status.in_reply_to_account_id is not None
|
||||
and status.in_reply_to_account_id != user
|
||||
):
|
||||
) and not replies_to_other_accounts_should_not_be_skipped:
|
||||
logger.info(
|
||||
"Skipping post %s because it's a reply to another person",
|
||||
status.uri,
|
||||
|
@ -147,6 +148,11 @@ def main():
|
|||
modules,
|
||||
user_id,
|
||||
url=url,
|
||||
replies_to_other_accounts_should_not_be_skipped=conf[
|
||||
"main"
|
||||
].getboolean(
|
||||
"replies_to_other_accounts_should_not_be_skipped", False
|
||||
),
|
||||
reconnect=conf["main"].getboolean("auto_reconnect", False),
|
||||
reconnect_delay=conf["main"].getfloat("reconnect_delay", 1.0),
|
||||
list=conf["main"]["list"],
|
||||
|
|
|
@ -12,6 +12,7 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
"""
|
||||
|
||||
from logging import getLogger
|
||||
from typing import List
|
||||
|
||||
|
|
|
@ -12,6 +12,7 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
"""
|
||||
|
||||
from abc import ABC, abstractmethod
|
||||
from configparser import ConfigParser, SectionProxy
|
||||
from typing import ClassVar, Dict, NamedTuple, Type
|
||||
|
|
|
@ -12,6 +12,7 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
"""
|
||||
|
||||
from configparser import SectionProxy
|
||||
from fnmatch import fnmatch
|
||||
from typing import List
|
||||
|
|
|
@ -12,6 +12,7 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
"""
|
||||
|
||||
from configparser import ConfigParser, SectionProxy
|
||||
from typing import Callable, ClassVar, Dict, List, Sequence
|
||||
from mastoposter.filters.base import BaseFilter, FilterInstance
|
||||
|
|
|
@ -12,6 +12,7 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
"""
|
||||
|
||||
from configparser import SectionProxy
|
||||
from typing import Literal, Set
|
||||
from mastoposter.filters.base import BaseFilter
|
||||
|
|
|
@ -12,6 +12,7 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
"""
|
||||
|
||||
from configparser import SectionProxy
|
||||
from re import Pattern, compile as regexp
|
||||
from typing import ClassVar, Set
|
||||
|
|
|
@ -12,6 +12,7 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
"""
|
||||
|
||||
from configparser import SectionProxy
|
||||
from re import Pattern, compile as regexp
|
||||
from mastoposter.filters.base import BaseFilter
|
||||
|
|
|
@ -12,6 +12,7 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
"""
|
||||
|
||||
from configparser import SectionProxy
|
||||
from re import Pattern, compile as regexp
|
||||
from typing import Optional, Set
|
||||
|
|
|
@ -12,6 +12,7 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
"""
|
||||
|
||||
from configparser import SectionProxy
|
||||
from typing import Set
|
||||
from mastoposter.filters.base import BaseFilter
|
||||
|
|
|
@ -12,6 +12,7 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
"""
|
||||
|
||||
from typing import List, NamedTuple
|
||||
from mastoposter.filters.base import FilterInstance
|
||||
|
||||
|
|
|
@ -12,6 +12,7 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
"""
|
||||
|
||||
from abc import ABC, abstractmethod
|
||||
from configparser import SectionProxy
|
||||
from typing import Optional
|
||||
|
|
|
@ -12,6 +12,7 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
"""
|
||||
|
||||
from configparser import SectionProxy
|
||||
from logging import getLogger
|
||||
from typing import List, Optional
|
||||
|
@ -51,9 +52,11 @@ class DiscordIntegration(BaseIntegration):
|
|||
"content": content,
|
||||
"username": username,
|
||||
"avatar_url": avatar_url,
|
||||
"embeds": [embed.asdict() for embed in embeds]
|
||||
"embeds": (
|
||||
[embed.asdict() for embed in embeds]
|
||||
if embeds is not None
|
||||
else [],
|
||||
else []
|
||||
),
|
||||
}
|
||||
|
||||
logger.debug("Executing webhook with %r", json)
|
||||
|
|
|
@ -12,6 +12,7 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
"""
|
||||
|
||||
from dataclasses import asdict, dataclass
|
||||
from datetime import datetime
|
||||
from typing import Any, Callable, Dict, List, Optional
|
||||
|
|
|
@ -12,6 +12,7 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
"""
|
||||
|
||||
from configparser import SectionProxy
|
||||
from dataclasses import dataclass
|
||||
from logging import getLogger
|
||||
|
|
|
@ -12,6 +12,7 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
"""
|
||||
|
||||
from asyncio import exceptions, sleep
|
||||
from json import loads
|
||||
from logging import getLogger
|
||||
|
|
|
@ -12,6 +12,7 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
"""
|
||||
|
||||
from typing import Callable, Iterable, Literal, Optional
|
||||
from bs4.element import Tag, PageElement
|
||||
|
||||
|
|
|
@ -12,6 +12,7 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
"""
|
||||
|
||||
from bs4 import NavigableString
|
||||
from mastoposter.text import (
|
||||
nodes_process,
|
||||
|
|
|
@ -12,6 +12,7 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
"""
|
||||
|
||||
from dataclasses import dataclass, field, fields
|
||||
from datetime import datetime
|
||||
from typing import Any, Callable, Optional, List, Literal, TypeVar
|
||||
|
|
|
@ -12,6 +12,7 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
"""
|
||||
|
||||
from configparser import ConfigParser
|
||||
from logging import getLogger
|
||||
|
||||
|
|
Loading…
Reference in New Issue