diff --git a/app/activitypub/routes.py b/app/activitypub/routes.py index ca5e9573..f010d983 100644 --- a/app/activitypub/routes.py +++ b/app/activitypub/routes.py @@ -707,7 +707,7 @@ def process_inbox_request(request_json, activitypublog_id, ip_address): user.flush_cache() if user.instance_id and user.instance_id != 1: user.instance.last_seen = utcnow() - user.instance.ip_address = ip_address + # user.instance.ip_address = ip_address user.instance.dormant = False if 'community' in vars() and community is not None: if community.is_local() and request_json['type'] not in ['Announce', 'Follow', 'Accept', 'Undo']: diff --git a/app/admin/routes.py b/app/admin/routes.py index 78847315..44c21c7f 100644 --- a/app/admin/routes.py +++ b/app/admin/routes.py @@ -202,7 +202,9 @@ def admin_community_edit(community_id): community.name = form.url.data community.title = form.title.data community.description = form.description.data + community.description_html = markdown_to_html(form.description.data) community.rules = form.rules.data + community.rules_html = markdown_to_html(form.rules.data) community.nsfw = form.nsfw.data community.local_only = form.local_only.data community.restricted_to_mods = form.restricted_to_mods.data diff --git a/app/community/routes.py b/app/community/routes.py index c4535e96..7079093e 100644 --- a/app/community/routes.py +++ b/app/community/routes.py @@ -36,7 +36,8 @@ def add_local(): private_key, public_key = RsaKeys.generate_keypair() community = Community(title=form.community_name.data, name=form.url.data, description=form.description.data, rules=form.rules.data, nsfw=form.nsfw.data, private_key=private_key, - public_key=public_key, + public_key=public_key, description_html=markdown_to_html(form.description.data), + rules_html=markdown_to_html(form.rules.data), ap_profile_id='https://' + current_app.config['SERVER_NAME'] + '/c/' + form.url.data, ap_followers_url='https://' + current_app.config['SERVER_NAME'] + '/c/' + form.url.data + '/followers', subscriptions_count=1, instance_id=1, low_quality='memes' in form.url.data) diff --git a/app/static/structure.css b/app/static/structure.css index 3a294846..50ebcb83 100644 --- a/app/static/structure.css +++ b/app/static/structure.css @@ -396,6 +396,9 @@ fieldset legend { margin-left: auto; margin-right: auto; } +.card .card-body img { + max-width: 100%; +} #breadcrumb_nav { font-size: 87%; diff --git a/app/static/structure.scss b/app/static/structure.scss index 2571659a..bf2c6bfa 100644 --- a/app/static/structure.scss +++ b/app/static/structure.scss @@ -49,6 +49,12 @@ nav, etc which are used site-wide */ max-width: 350px; margin-left: auto; margin-right: auto; + + .card-body { + img { + max-width: 100%; + } + } } #breadcrumb_nav { diff --git a/interests.txt b/interests.txt index 78e16f47..0bc749fa 100644 --- a/interests.txt +++ b/interests.txt @@ -1,11 +1,11 @@ chilling https://kbin.social/m/AskKbin - https://kbin.social/m/TodayILearned - https://kbin.social/m/showerthoughts + https://lemmy.world/c/til + https://lemmy.world/c/unpopularopinion + https://lemmy.world/c/showerthoughts https://kbin.social/m/ELI5 https://kbin.social/m/scifi - https://kbin.social/m/wholesome - https://kbin.social/m/oddlysatisfying + https://lemmy.world/c/lemmybewholesome https://kbin.social/m/Funny https://kbin.social/m/photography https://kbin.social/m/videos @@ -49,8 +49,8 @@ gaming interesting stuff https://kbin.social/m/science - https://kbin.social/m/space - https://kbin.social/m/interestingasfuck + https://lemmy.world/c/space + https://lemmy.world/c/interestingasfuck https://kbin.social/m/Futurology https://kbin.social/m/mildlyinteresting https://lemmy.world/c/mildlyinteresting @@ -136,7 +136,6 @@ lgbtq https://lemmy.blahaj.zone/c/ftm https://lemmy.blahaj.zone/c/mtf https://lemmy.blahaj.zone/c/lgbtq_plus - https://lemmy.blahaj.zone/c/ftm https://lemmy.one/c/nonbinary environment