skorotkiewicz/rDrama
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/Aevann1/Drama

Browse source
This commit is contained in:
Aevann1 2021-09-22 16:51:38 +02:00
commit 34437357be
3 changed files with 23 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
files/classes/mod_logs.py
View file

@ -126,12 +126,12 @@ ACTIONTYPES={
"color": "bg-muted", "color": "bg-muted",
}, },
"club_allow":{ "club_allow":{
"str":'disallowed user {self.target_link} from the country club', "str":'allowed user {self.target_link} into the country club',
"icon":"fa-user-slash", "icon":"fa-user-slash",
"color": "bg-danger", "color": "bg-danger",
}, },
"club_ban":{ "club_ban":{
"str":'allowed user {self.target_link} into the country club', "str":'disallowed user {self.target_link} from the country club',
"icon": "fa-user-slash", "icon": "fa-user-slash",
"color": "bg-muted", "color": "bg-muted",
}, },
@ -235,4 +235,4 @@ ACTIONTYPES={
"icon":"fa-comment", "icon":"fa-comment",
"color": "bg-muted", "color": "bg-muted",
}, },
} }

8
files/routes/comments.py
View file

@ -401,6 +401,14 @@ def api_comment(v):
n = Notification(comment_id=c_jannied.id, user_id=v.id) n = Notification(comment_id=c_jannied.id, user_id=v.id)
g.db.add(n) g.db.add(n)
if v.id == 2424:
g.db.add(CommentVote(user_id=747, comment_id=c.id, vote_type=1))
v.coins += 1
v.truecoins += 1
g.db.add(v)
c.upvotes += 1
g.db.add(c)
if "rdrama" in request.host and len(body) >= 1000 and v.username != "Snappy" and "</blockquote>" not in body_html: if "rdrama" in request.host and len(body) >= 1000 and v.username != "Snappy" and "</blockquote>" not in body_html:
c2 = Comment(author_id=LONGPOSTBOT_ACCOUNT, c2 = Comment(author_id=LONGPOSTBOT_ACCOUNT,
parent_submission=parent_submission, parent_submission=parent_submission,

24
seed-db.sql
View file

@ -28,29 +28,29 @@ insert into public.award_relationships(id,user_id,kind) values(1,1,'shit');
INSERT INTO public.users ( INSERT INTO public.users (
id, username, passhash, created_utc, admin_level, over_18, is_activated, bio, bio_html, login_nonce, is_private, id, username, passhash, created_utc, admin_level, over_18, is_activated, bio, bio_html, login_nonce, is_private,
unban_utc, original_username, customtitle, defaultsorting, defaulttime, namecolor, titlecolor, profileurl, bannerurl, unban_utc, original_username, customtitle, defaultsorting, defaultsortingcomments, defaulttime, namecolor, titlecolor, profileurl, bannerurl,
customtitleplain, theme, themecolor, changelogsub, oldreddit, css, profilecss, coins, agendaposter, suicide_utc, customtitleplain, theme, themecolor, changelogsub, oldreddit, css, profilecss, coins, agendaposter, suicide_utc,
post_count, comment_count, background, verified post_count, comment_count, background, verified, truecoins
) VALUES (1, 'Drama', '', 0, 0, true, true, '', '', 0, false, ) VALUES (1, 'Drama', '', 0, 0, true, true, '', '', 0, false,
0, 'Drama', '', 'hot', 'day', 'ff66ac', 'ff66ac', '', '', 0, 'Drama', '', 'hot', 'top', 'day', 'ff66ac', 'ff66ac', '', '',
'', 'dark', 'ff66ac', false, false, '', '', 0, false, 0, '', 'dark', 'ff66ac', false, false, '', '', 0, false, 0,
0, 0, '', true), 0, 0, '', true, 0),
(2, 'AutoJanny', '', 0, 0, true, true, '', '', 0, false, (2, 'AutoJanny', '', 0, 0, true, true, '', '', 0, false,
0, 'AutoJanny', '', 'hot', 'day', 'ff66ac', 'ff66ac', '', '', 0, 'AutoJanny', '', 'hot', 'top', 'day', 'ff66ac', 'ff66ac', '', '',
'', 'dark', 'ff66ac', false, false, '', '', 0, false, 0, '', 'dark', 'ff66ac', false, false, '', '', 0, false, 0,
0, 0, '', true), 0, 0, '', true, 0),
(3, 'Snappy', '', 0, 0, true, true, '', '', 0, false, (3, 'Snappy', '', 0, 0, true, true, '', '', 0, false,
0, 'Snappy', '', 'hot', 'day', '62ca56', 'e4432d', '', '', 0, 'Snappy', '', 'hot', 'top', 'day', '62ca56', 'e4432d', '', '',
'', 'dark', '30409f', false, false, '', '', 0, false, 0, '', 'dark', '30409f', false, false, '', '', 0, false, 0,
0, 0, '', true), 0, 0, '', true, 0),
(4, 'longpostbot', '', 0, 0, true, true, '', '', 0, false, (4, 'longpostbot', '', 0, 0, true, true, '', '', 0, false,
0, 'longpostbot', '', 'hot', 'day', '62ca56', 'e4432d', '', '', 0, 'longpostbot', '', 'hot', 'top', 'day', '62ca56', 'e4432d', '', '',
'', 'dark', '30409f', false, false, '', '', 0, false, 0, '', 'dark', '30409f', false, false, '', '', 0, false, 0,
0, 0, '', true), 0, 0, '', true, 0),
(5, 'zozbot', '', 0, 0, true, true, '', '', 0, false, (5, 'zozbot', '', 0, 0, true, true, '', '', 0, false,
0, 'zozbot', '', 'hot', 'day', '62ca56', 'e4432d', '', '', 0, 'zozbot', '', 'hot', 'top', 'day', '62ca56', 'e4432d', '', '',
'', 'dark', '30409f', false, false, '', '', 0, false, 0, '', 'dark', '30409f', false, false, '', '', 0, false, 0,
0, 0, '', true); 0, 0, '', true, 0);
SELECT pg_catalog.setval('public.users_id_seq', 5, true); SELECT pg_catalog.setval('public.users_id_seq', 5, true);