From 459e479c0703f6402c7f7bdc0b70fc0eb11bc722 Mon Sep 17 00:00:00 2001 From: Luri Darmawan Date: Thu, 31 Oct 2024 13:33:02 +0700 Subject: [PATCH 01/19] add blacklisted url --- public_html/carik/files/blacklist-url.txt | 32 +++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 public_html/carik/files/blacklist-url.txt diff --git a/public_html/carik/files/blacklist-url.txt b/public_html/carik/files/blacklist-url.txt new file mode 100644 index 0000000..9fe1a47 --- /dev/null +++ b/public_html/carik/files/blacklist-url.txt @@ -0,0 +1,32 @@ +bansosupdate2024.trustklik.live +lowonganbumn-terbaru2024.directklick.com +lokerindonesia2024.lokerblog.net +pendaftaranjcodonuts2024.directklick.com +antgpt.org/h5/index.html#/pages/user/register?shareCode=600167 +bansos2024.info/cek +bansos2024.regist-report22.com +claim-danabansos.directklick.com +claim-danabansos.sosialasia.com +claimm-danabansos.smediax.online +click-bansosvia-telegram.web.id +cliick-informaasi-baansos2024.my.id +cpxsppk.plx-8.systems/unpkg.com +feji.us/informasi-bansos2024t.me/mh_aripin +feji.us/lapangankerja-bumn +feji.us/mytelkomsel2024 +infoloker.aplly-my.com/Jobs +lokerbumn-2024.guirel.win +lowongan-kerja2024.apd-d1.com/jb +lowongankerja.vrole.uk/zpgs86a +pendaftaran-kerja.info-1d.com/aply1 +qclaim-danaabnsos.smediax.com +rakyat.me/dftxrkn/?SKDCPNS2024 +rekrutmenbersamabumn05.byfux.win +rekrutmenbersamabumn19.byfux.win +s.id/Loker_Update_2024 +s.id/Rekrutmenttssbersama +s.id/lOkerinsdonesiaterupdatessn +s.id/rekrutsmentsbersmbumn2024isn +satuin.web.id/1AVxF/?Lowongankerja2024 +searchloker02.newinfo.cc +voxmn.pl/nKHr8/?LokerBUMN24 \ No newline at end of file From 4111092a11ff592a6421cb78bcd915602644c475 Mon Sep 17 00:00:00 2001 From: Luri Darmawan Date: Fri, 15 Nov 2024 03:57:19 +0700 Subject: [PATCH 02/19] check blacklisted url; manual check group member count; --- public_html/carik/files/blacklist-url.txt | 27 ++++++++++++++- source/common/carik.inc | 1 + source/common/carik_webmodule.pas | 15 +++++++++ source/common/telegram_handler.pas | 41 +++++++++++++++++++++-- 4 files changed, 80 insertions(+), 4 deletions(-) diff --git a/public_html/carik/files/blacklist-url.txt b/public_html/carik/files/blacklist-url.txt index 9fe1a47..7c167e2 100644 --- a/public_html/carik/files/blacklist-url.txt +++ b/public_html/carik/files/blacklist-url.txt @@ -1,10 +1,14 @@ +aply1-id.com +bansos-2024.info bansosupdate2024.trustklik.live +EmpirTokenxBot lowonganbumn-terbaru2024.directklick.com lokerindonesia2024.lokerblog.net pendaftaranjcodonuts2024.directklick.com antgpt.org/h5/index.html#/pages/user/register?shareCode=600167 bansos2024.info/cek bansos2024.regist-report22.com +clalm.one claim-danabansos.directklick.com claim-danabansos.sosialasia.com claimm-danabansos.smediax.online @@ -14,19 +18,40 @@ cpxsppk.plx-8.systems/unpkg.com feji.us/informasi-bansos2024t.me/mh_aripin feji.us/lapangankerja-bumn feji.us/mytelkomsel2024 +geets-cliks.com +ghiju.us +gshortlink.com infoloker.aplly-my.com/Jobs +informasi.us.to +linkin.bio/layananmo lokerbumn-2024.guirel.win +lokerr-update2024.trustklik.live lowongan-kerja2024.apd-d1.com/jb lowongankerja.vrole.uk/zpgs86a pendaftaran-kerja.info-1d.com/aply1 +putri_aniss334 qclaim-danaabnsos.smediax.com rakyat.me/dftxrkn/?SKDCPNS2024 rekrutmenbersamabumn05.byfux.win rekrutmenbersamabumn19.byfux.win +s.id/bantuansosial s.id/Loker_Update_2024 s.id/Rekrutmenttssbersama s.id/lOkerinsdonesiaterupdatessn +s.id/lokerterbaru s.id/rekrutsmentsbersmbumn2024isn satuin.web.id/1AVxF/?Lowongankerja2024 searchloker02.newinfo.cc -voxmn.pl/nKHr8/?LokerBUMN24 \ No newline at end of file +spoo.me +t.me/+dIRnvlnAAd5jZjc8 +t.me/major +t.me/SecureStocks +t.me/TATTIAHOE +trustklik.live +vitur.me +voxmn.pl/nKHr8/?LokerBUMN24 +XEmpireTelegramBot +xFreeSpinx_bot +xtoncoinspin_bot +xtonspin_bot +ze-me.xyz diff --git a/source/common/carik.inc b/source/common/carik.inc index f2614fe..df65d25 100644 --- a/source/common/carik.inc +++ b/source/common/carik.inc @@ -76,6 +76,7 @@ const LINE_TOKEN = 'line/default/token'; LINE_BOT_REPLY_DISABLE = 'line/default/reply_disable'; LINE_BOT_FIRST_SESSION_RESPONSE = 'line/default/first_session_response'; + TELEGRAM_GROUP_MAXIMUM_MEMBER_COUNT = 1500; WITAI_TOKEN = 'witai/default/token'; GOOGLE_KEY = 'google/default/key'; diff --git a/source/common/carik_webmodule.pas b/source/common/carik_webmodule.pas index 49b1035..7a1e6e8 100644 --- a/source/common/carik_webmodule.pas +++ b/source/common/carik_webmodule.pas @@ -3209,6 +3209,7 @@ function TCarikWebModule.SpamScore(AUserID: string; AText: string; i, j, additionScore: integer; s, triggerName, triggerWord: string; jData: TJSONData; + lstURL: TStringList; begin Result := 0; AText := AText.ToLower; @@ -3247,6 +3248,7 @@ function TCarikWebModule.SpamScore(AUserID: string; AText: string; triggerWord := jData.Items[i].Items[j].AsString; if preg_match(triggerWord, AText) then begin + LogUtil.Add(triggerName + '/' + triggerWord, 'SPAM-CHECK'); Result := Result + additionScore; end; end; @@ -3255,7 +3257,20 @@ function TCarikWebModule.SpamScore(AUserID: string; AText: string; if Result < 80 then begin + // check blacklisted URL + lstURL := TStringList.Create; + lstURL.LoadFromFile('files/blacklist-url.txt'); + for i := 0 to lstURL.Count -1 do + begin + if Pos( LowerCase(lstURL[i]), AText) > 0 then + begin + Result := Result + 10; + end; + end; + lstURL.Free + //TODO: check from spam-score api; + end; if Result >= SPAM_SCORE_THRESHOLD then diff --git a/source/common/telegram_handler.pas b/source/common/telegram_handler.pas index f0b735b..c0b49f6 100644 --- a/source/common/telegram_handler.pas +++ b/source/common/telegram_handler.pas @@ -415,8 +415,8 @@ procedure TTelegramHandler.Get; procedure TTelegramHandler.Post; var updateID, lastUpdateID: longint; - i, j, spamScoreTotal: integer; - s, imgTag, audioCaption, voiceFileName, mp3FileName, tmpStr, fileType, fileCaption, url: string; + i, j, spamScoreTotal, memberCount, deltaMember: integer; + s, key, imgTag, audioCaption, voiceFileName, mp3FileName, tmpStr, fileType, fileCaption, url: string; disableMarkdown, isHandled, localReplyDisable, canSendMessage, isEditMessage: boolean; forceSendMessage, forceReply: boolean; replyText: TStringList; @@ -480,6 +480,32 @@ procedure TTelegramHandler.Post; SimpleBOT.FirstSessionResponse := s2b(Config[TELEGRAM_BOT_FIRST_SESSION_RESPONSE]); + // get member count + deltaMember := 0; + if TELEGRAM.IsGroup then + begin + memberCount := TELEGRAM.GroupMemberCount(TELEGRAM.ChatID); + if memberCount > TELEGRAM_GROUP_MAXIMUM_MEMBER_COUNT then + begin + key := BotName + '_group_' + TELEGRAM.ChatID + '_count'; + s := SimpleBOT.Redis[key]; + LogUtil.Add(TELEGRAM.GroupName + '; member dari db: ' + s, '#MEMBER'); + if s2i(s) <= 0 then + begin + LogUtil.Add(TELEGRAM.GroupName + '; set db: ' + memberCount.ToString, '#MEMBER'); + end + else + begin + deltaMember := memberCount - s2i(s); + if deltaMember > 0 then + LogUtil.Add(TELEGRAM.GroupName + ' member: ADD: ' + memberCount.ToString + ' ('+deltaMember.ToString+')', '#MEMBER') + else + LogUtil.Add(TELEGRAM.GroupName + ' member: ' + memberCount.ToString + ' ('+deltaMember.ToString+')', '#MEMBER'); + end; + SimpleBOT.Redis[key] := memberCount.ToString; + end; + end; + if IsGlobalUserBlackListed(Carik.UserPrefix + '-' + Carik.UserID) then begin LogUtil.Add('user blacklist: ' + Carik.UserID + '|' + Carik.FullName,'TELE'); @@ -737,7 +763,7 @@ procedure TTelegramHandler.Post; LogJoin(TELEGRAM_CHANNEL_ID, TELEGRAM.ChatID, TELEGRAM.GroupName, TELEGRAM.InvitedUserId, TELEGRAM.InvitedUserName, TELEGRAM.InvitedFullName, TELEGRAM.InvitedBy, RestrictUser); LogUtil.Add(Request.Content.Replace(#13,'').Replace(#10,''), 'JOIN'); end; - exit; delete + //ULIL: exit; end else begin @@ -1342,6 +1368,15 @@ procedure TTelegramHandler.Post; //LogChat(TELEGRAM_CHANNEL_ID, Carik.GroupChatID, Carik.GroupName, // '-1', TELEGRAM.ResultMessageID, SimpleBOT.SimpleAI.ResponseText.Text, '', // Carik.IsGroup, False); + if deltaMember > 0 then + begin + s := 'Group ini sepertinya kedatangan %s member baru.\nCoba colek admin untuk checking.'; + s += '\n(' + TELEGRAM.AdminListAsString + ')'; + s := s.Replace('%s', deltaMember.ToString); + TELEGRAM.SendMessage(TELEGRAM.ChatID, s); + LogUtil.Add('send notif ke ' + TELEGRAM.GroupName + ', baru: ' + deltaMember.ToString, '#MEMBER'); + //TELEGRAM.SendMessage(TELEGRAM.ChatID, s, MessageID, currentThreadIdAsString); + end; end; s := Text; From 2e1786e66b15546f009a87f8d597fc76b3c6c3ff Mon Sep 17 00:00:00 2001 From: Luri Darmawan Date: Fri, 15 Nov 2024 04:02:26 +0700 Subject: [PATCH 03/19] check forwarded message --- source/common/carik.inc | 2 ++ source/common/carik_webmodule.pas | 4 ++-- source/common/telegram_handler.pas | 8 ++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/source/common/carik.inc b/source/common/carik.inc index df65d25..fe565c2 100644 --- a/source/common/carik.inc +++ b/source/common/carik.inc @@ -139,10 +139,12 @@ const NEW_MEMBER_INTERVAL_POST_PERMITTED = 20; SPAM_SCORE_THRESHOLD = 80; + SPAM_SCORE_FORWARD_STORY = 80; SPAM_WORD = 'ai/default/spam_word'; SPAM_CAS_OFFENSE = 1; // api.cas.chat GROUP_DATA_FILENAME = 'files/carik/carik-groupdata.dat'; + BLACKLIST_URL_FILENAME = 'files/blacklist-url.txt'; CALLBACK_QUERY_TIMEOUT = 5; // 5 minutes CALLBACK_QUERY_TIMEOUT_PREFIX = 30; // 5 minutes MESSAGE_TYPE = 'message_type'; diff --git a/source/common/carik_webmodule.pas b/source/common/carik_webmodule.pas index 7a1e6e8..2984b37 100644 --- a/source/common/carik_webmodule.pas +++ b/source/common/carik_webmodule.pas @@ -3259,12 +3259,12 @@ function TCarikWebModule.SpamScore(AUserID: string; AText: string; begin // check blacklisted URL lstURL := TStringList.Create; - lstURL.LoadFromFile('files/blacklist-url.txt'); + lstURL.LoadFromFile(BLACKLIST_URL_FILENAME); for i := 0 to lstURL.Count -1 do begin if Pos( LowerCase(lstURL[i]), AText) > 0 then begin - Result := Result + 10; + Result := Result + 30; end; end; lstURL.Free diff --git a/source/common/telegram_handler.pas b/source/common/telegram_handler.pas index c0b49f6..dab5bbf 100644 --- a/source/common/telegram_handler.pas +++ b/source/common/telegram_handler.pas @@ -817,6 +817,14 @@ procedure TTelegramHandler.Post; begin spamScoreTotal := SPAM_SCORE_THRESHOLD; end; + if TELEGRAM.IsForwardFromStory then + begin + spamScoreTotal+= SPAM_SCORE_FORWARD_STORY; + if isBlackListed( TELEGRAM.UserName, TELEGRAM.UserID) then + begin + spamScoreTotal+= SPAM_SCORE_THRESHOLD; + end; + end; if Carik.isSpamChecking or (spamScoreTotal>0) then begin //if s.IsNotEmpty then //TODO: fix function isSpamChecking From 64155c4bc9df74f9b7f0335f9f7364f04e0c9b1b Mon Sep 17 00:00:00 2001 From: Luri Darmawan Date: Mon, 18 Nov 2024 10:57:01 +0700 Subject: [PATCH 04/19] blacklist --- public_html/carik/files/blacklist-url.txt | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/public_html/carik/files/blacklist-url.txt b/public_html/carik/files/blacklist-url.txt index 7c167e2..cea22d3 100644 --- a/public_html/carik/files/blacklist-url.txt +++ b/public_html/carik/files/blacklist-url.txt @@ -1,12 +1,8 @@ aply1-id.com +antgpt.org bansos-2024.info bansosupdate2024.trustklik.live -EmpirTokenxBot -lowonganbumn-terbaru2024.directklick.com -lokerindonesia2024.lokerblog.net -pendaftaranjcodonuts2024.directklick.com -antgpt.org/h5/index.html#/pages/user/register?shareCode=600167 -bansos2024.info/cek +bansos2024.info bansos2024.regist-report22.com clalm.one claim-danabansos.directklick.com @@ -15,6 +11,9 @@ claimm-danabansos.smediax.online click-bansosvia-telegram.web.id cliick-informaasi-baansos2024.my.id cpxsppk.plx-8.systems/unpkg.com +directklick.com +dogsprize_bot +EmpirTokenxBot feji.us/informasi-bansos2024t.me/mh_aripin feji.us/lapangankerja-bumn feji.us/mytelkomsel2024 @@ -26,15 +25,20 @@ informasi.us.to linkin.bio/layananmo lokerbumn-2024.guirel.win lokerr-update2024.trustklik.live +lokerindonesia2024.lokerblog.net lowongan-kerja2024.apd-d1.com/jb lowongankerja.vrole.uk/zpgs86a +lowonganbumn-terbaru2024.directklick.com +pendaftaranjcodonuts2024.directklick.com pendaftaran-kerja.info-1d.com/aply1 putri_aniss334 qclaim-danaabnsos.smediax.com rakyat.me/dftxrkn/?SKDCPNS2024 +Raymond_adminFx rekrutmenbersamabumn05.byfux.win rekrutmenbersamabumn19.byfux.win s.id/bantuansosial +s.id/dtkssbans0sterupdate s.id/Loker_Update_2024 s.id/Rekrutmenttssbersama s.id/lOkerinsdonesiaterupdatessn @@ -44,6 +48,7 @@ satuin.web.id/1AVxF/?Lowongankerja2024 searchloker02.newinfo.cc spoo.me t.me/+dIRnvlnAAd5jZjc8 +t.me/+mNW8EcFfbHw5ZTQ0 t.me/major t.me/SecureStocks t.me/TATTIAHOE From 41c357fc5d30c54705535f3e7d0c3101d81105f2 Mon Sep 17 00:00:00 2001 From: Luri Darmawan Date: Fri, 22 Nov 2024 14:09:16 +0700 Subject: [PATCH 05/19] add blacklist --- public_html/carik/files/blacklist-url.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/public_html/carik/files/blacklist-url.txt b/public_html/carik/files/blacklist-url.txt index cea22d3..86e9d11 100644 --- a/public_html/carik/files/blacklist-url.txt +++ b/public_html/carik/files/blacklist-url.txt @@ -1,3 +1,4 @@ +AirdropMaga.lol aply1-id.com antgpt.org bansos-2024.info @@ -11,8 +12,9 @@ claimm-danabansos.smediax.online click-bansosvia-telegram.web.id cliick-informaasi-baansos2024.my.id cpxsppk.plx-8.systems/unpkg.com +DinoAirdBot directklick.com -dogsprize_bot +dogsprize_bot EmpirTokenxBot feji.us/informasi-bansos2024t.me/mh_aripin feji.us/lapangankerja-bumn From b52ca68c3cb20bee69d6e2f527027b370445e15a Mon Sep 17 00:00:00 2001 From: Luri Darmawan Date: Sun, 1 Dec 2024 09:08:57 +0700 Subject: [PATCH 06/19] add blacklist url --- public_html/carik/files/blacklist-url.txt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/public_html/carik/files/blacklist-url.txt b/public_html/carik/files/blacklist-url.txt index 86e9d11..2d88725 100644 --- a/public_html/carik/files/blacklist-url.txt +++ b/public_html/carik/files/blacklist-url.txt @@ -5,6 +5,8 @@ bansos-2024.info bansosupdate2024.trustklik.live bansos2024.info bansos2024.regist-report22.com +bantuan.us.to +best-value.ltd clalm.one claim-danabansos.directklick.com claim-danabansos.sosialasia.com @@ -20,6 +22,7 @@ feji.us/informasi-bansos2024t.me/mh_aripin feji.us/lapangankerja-bumn feji.us/mytelkomsel2024 geets-cliks.com +gets-offcial.com ghiju.us gshortlink.com infoloker.aplly-my.com/Jobs @@ -29,16 +32,21 @@ lokerbumn-2024.guirel.win lokerr-update2024.trustklik.live lokerindonesia2024.lokerblog.net lowongan-kerja2024.apd-d1.com/jb -lowongankerja.vrole.uk/zpgs86a +lowongankerja.vrole.uk +lowongankerja2024.online lowonganbumn-terbaru2024.directklick.com +kminfo.app +Notcoin_DroopBot pendaftaranjcodonuts2024.directklick.com pendaftaran-kerja.info-1d.com/aply1 +ppkh.site putri_aniss334 qclaim-danaabnsos.smediax.com rakyat.me/dftxrkn/?SKDCPNS2024 Raymond_adminFx rekrutmenbersamabumn05.byfux.win rekrutmenbersamabumn19.byfux.win +rkyt.eu s.id/bantuansosial s.id/dtkssbans0sterupdate s.id/Loker_Update_2024 @@ -54,6 +62,7 @@ t.me/+mNW8EcFfbHw5ZTQ0 t.me/major t.me/SecureStocks t.me/TATTIAHOE +telegra.ph/Free-TON-Giveaway-11-30 trustklik.live vitur.me voxmn.pl/nKHr8/?LokerBUMN24 From 7aedc0edd75bdad8e26d7e5bbbe2d3d64e6741a4 Mon Sep 17 00:00:00 2001 From: Luri Darmawan Date: Fri, 6 Dec 2024 05:35:05 +0700 Subject: [PATCH 07/19] add blacklist --- public_html/carik/files/.gitignore | 1 + public_html/carik/files/blacklist-global.txt | 2 ++ public_html/carik/files/blacklist-url.txt | 4 ++++ 3 files changed, 7 insertions(+) create mode 100644 public_html/carik/files/.gitignore diff --git a/public_html/carik/files/.gitignore b/public_html/carik/files/.gitignore new file mode 100644 index 0000000..5196215 --- /dev/null +++ b/public_html/carik/files/.gitignore @@ -0,0 +1 @@ +blacklist.txt \ No newline at end of file diff --git a/public_html/carik/files/blacklist-global.txt b/public_html/carik/files/blacklist-global.txt index 6536ff7..d8bbb4a 100644 --- a/public_html/carik/files/blacklist-global.txt +++ b/public_html/carik/files/blacklist-global.txt @@ -1,5 +1,6 @@ Test Luri,62878764690001 Ace Hardware,6281314789856 +AstraPay,6288807619898 Bank Allo,62811681846110 Bank BCA,62811615006998 Bank BTPN,6281218976774 @@ -15,6 +16,7 @@ Honest OTP,6281119959581 Jenius,6281218976774 KAI121,6281112111121 Mega Life,6281197900111 +MRT Jakarta,6285195901552 Prioritas Info,6281808800055 Shopee Security,6285574670796 Telkomsel,6281111111111 diff --git a/public_html/carik/files/blacklist-url.txt b/public_html/carik/files/blacklist-url.txt index 2d88725..f85e42c 100644 --- a/public_html/carik/files/blacklist-url.txt +++ b/public_html/carik/files/blacklist-url.txt @@ -1,3 +1,4 @@ +$DOGS AirdropMaga.lol aply1-id.com antgpt.org @@ -16,6 +17,7 @@ cliick-informaasi-baansos2024.my.id cpxsppk.plx-8.systems/unpkg.com DinoAirdBot directklick.com +dogshouse_bot dogsprize_bot EmpirTokenxBot feji.us/informasi-bansos2024t.me/mh_aripin @@ -36,6 +38,7 @@ lowongankerja.vrole.uk lowongankerja2024.online lowonganbumn-terbaru2024.directklick.com kminfo.app +MajorAidrops_Bot Notcoin_DroopBot pendaftaranjcodonuts2024.directklick.com pendaftaran-kerja.info-1d.com/aply1 @@ -63,6 +66,7 @@ t.me/major t.me/SecureStocks t.me/TATTIAHOE telegra.ph/Free-TON-Giveaway-11-30 +tribunsinfo.cc trustklik.live vitur.me voxmn.pl/nKHr8/?LokerBUMN24 From be1f06cb65b09dbffb87b60368d7aa77af16ca7d Mon Sep 17 00:00:00 2001 From: Luri Darmawan Date: Mon, 16 Dec 2024 10:17:15 +0700 Subject: [PATCH 08/19] add blacklist --- public_html/carik/files/blacklist-global.txt | 1 + public_html/carik/files/blacklist-url.txt | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/public_html/carik/files/blacklist-global.txt b/public_html/carik/files/blacklist-global.txt index d8bbb4a..cd46645 100644 --- a/public_html/carik/files/blacklist-global.txt +++ b/public_html/carik/files/blacklist-global.txt @@ -6,6 +6,7 @@ Bank BCA,62811615006998 Bank BTPN,6281218976774 Bank Mega,6282208223322 Bank Mega Kartu Kredit,628226082262107 +Blibli Promotion,6281517551356 Blibli Tiket,6281119215050 Cinepolis Indonesia,6287777731078 Citilink,6281110110808 diff --git a/public_html/carik/files/blacklist-url.txt b/public_html/carik/files/blacklist-url.txt index f85e42c..e99b193 100644 --- a/public_html/carik/files/blacklist-url.txt +++ b/public_html/carik/files/blacklist-url.txt @@ -8,6 +8,7 @@ bansos2024.info bansos2024.regist-report22.com bantuan.us.to best-value.ltd +byfux.win clalm.one claim-danabansos.directklick.com claim-danabansos.sosialasia.com @@ -18,6 +19,7 @@ cpxsppk.plx-8.systems/unpkg.com DinoAirdBot directklick.com dogshouse_bot +dogsqhouse_bot dogsprize_bot EmpirTokenxBot feji.us/informasi-bansos2024t.me/mh_aripin @@ -39,7 +41,10 @@ lowongankerja2024.online lowonganbumn-terbaru2024.directklick.com kminfo.app MajorAidrops_Bot +MAJORSTORYBOT +newsupdate.asia Notcoin_DroopBot +PAWSQO_BOT pendaftaranjcodonuts2024.directklick.com pendaftaran-kerja.info-1d.com/aply1 ppkh.site @@ -59,17 +64,22 @@ s.id/lokerterbaru s.id/rekrutsmentsbersmbumn2024isn satuin.web.id/1AVxF/?Lowongankerja2024 searchloker02.newinfo.cc +SpinTetherBOT spoo.me t.me/+dIRnvlnAAd5jZjc8 t.me/+mNW8EcFfbHw5ZTQ0 +t.me/JOIN_THE_WINNING_PROCESS t.me/major t.me/SecureStocks t.me/TATTIAHOE telegra.ph/Free-TON-Giveaway-11-30 +TetherSpinsBOT +TondropAI_bot tribunsinfo.cc trustklik.live vitur.me voxmn.pl/nKHr8/?LokerBUMN24 +xbeack.asia XEmpireTelegramBot xFreeSpinx_bot xtoncoinspin_bot From 038e3bf01b6a1d914dc22c244c337cfbd10aa869 Mon Sep 17 00:00:00 2001 From: Luri Darmawan Date: Mon, 16 Dec 2024 10:23:38 +0700 Subject: [PATCH 09/19] Custom File Handler, change device id variable, add join & forward log; telegram: send audio message --- source/common/carik_webmodule.pas | 42 ++++++++++++++++++++++-------- source/common/direct_handler.pas | 2 +- source/common/telegram_handler.pas | 27 ++++++++++++------- 3 files changed, 50 insertions(+), 21 deletions(-) diff --git a/source/common/carik_webmodule.pas b/source/common/carik_webmodule.pas index 2984b37..bf6873e 100644 --- a/source/common/carik_webmodule.pas +++ b/source/common/carik_webmodule.pas @@ -114,6 +114,7 @@ TCarikWebModule = class(TMyCustomWebModule) FVenueLongitude: double; FVenueName: string; FGroupData: TIniFile; + FIsCustomActionFileExist:boolean; // TELEGRAM function getActiveContext: string; @@ -419,6 +420,7 @@ TCarikWebModule = class(TMyCustomWebModule) property CustomReplyURLFromExternalNLP: string read FCustomReplyURLFromExternalNLP; property CustomReplyActionTypeFromExternalNLP: string read FCustomReplyActionTypeFromExternalNLP; property CustomReplyDataFromExternalNLP: TJSONUtil read FCustomReplyDataFromExternalNLP; + property IsCustomActionFileExist: boolean read FIsCustomActionFileExist write FIsCustomActionFileExist; procedure SaveActionToUserDataFromCard(AData: TJSONObject); procedure SaveActionToUserDataFromForm(AData: TJSONObject); procedure SaveActionToUserData(AActionType: string; AData: TJSONObject = nil); @@ -3262,7 +3264,7 @@ function TCarikWebModule.SpamScore(AUserID: string; AText: string; lstURL.LoadFromFile(BLACKLIST_URL_FILENAME); for i := 0 to lstURL.Count -1 do begin - if Pos( LowerCase(lstURL[i]), AText) > 0 then + if Pos( LowerCase(lstURL[i]).Trim, AText) > 0 then begin Result := Result + 30; end; @@ -4030,6 +4032,11 @@ function TCarikWebModule.GenerateResponseJson: string; jsonOutput['processing_time'] := SimpleBOT.SimpleAI.ElapsedTime.ToString.ToInteger; end; + if FIsCustomActionFileExist then + begin + jsonOutput.ValueArray['action/files'] := FCustomActionFiles; + end; + if FIsDebug then Result := jsonOutput.AsJSONFormated else @@ -4537,8 +4544,10 @@ procedure TCarikWebModule.LogChat(AChannelID: string; AGroupID: string; httpResponse := Post; if _GET['_DEBUG'] <> '1' then begin - //LogUtil.Add(httpResponse.ResultText, 'logchat'); end; + //LogUtil.Add(responseJson.AsJSON, 'logchat'); + //LogUtil.Add(log_url, 'logchat'); + //LogUtil.Add(httpResponse.ResultText, 'logchat'); Free; end; try @@ -4606,6 +4615,7 @@ procedure TCarikWebModule.LogJoin(AChannelID: string; AGroupID: string; ContentType := 'application/json'; RequestBody := TStringStream.Create(requestJson.AsJSON); try + LogUtil.Add( 'submit: ' + requestJson.AsJSON, 'JOIN', False, AppData.logDir + 'logjoin.log'); http_response := Post; LogUtil.Add( 'response-join: ' + http_response.ResultText, 'JOIN'); except @@ -4750,6 +4760,7 @@ constructor TCarikWebModule.CreateNew(AOwner: TComponent; CreateMode: integer); SimpleBOT.StorageType := stRedis; end; Carik := TCarikController.Create; + FCustomActionFiles := nil; FLanguage := 'en-id'; FSendAudio := False; FSendPhoto := False; @@ -4790,6 +4801,7 @@ constructor TCarikWebModule.CreateNew(AOwner: TComponent; CreateMode: integer); FCustomReplyTypeFromExternalNLP := ''; FCustomReplyURLFromExternalNLP := ''; FCustomReplyActionTypeFromExternalNLP := ''; + FIsCustomActionFileExist := False; FExternalNLPStarted := False; FGPTTimeout := 0; FPackageName := ''; @@ -4938,7 +4950,7 @@ function TCarikWebModule.ProcessText(AMessage: string): string; begin SimpleBOT.SimpleAI.AdditionalParameters.Values['ClientId'] := ClientId;; SimpleBOT.SimpleAI.AdditionalParameters.Values['client_id'] := ClientId; - if DeviceId.IsNotEmpty then SimpleBOT.SimpleAI.AdditionalParameters.Values['dashboard_device_id'] := DeviceId; + if DeviceId.IsNotEmpty then SimpleBOT.SimpleAI.AdditionalParameters.Values['dashboard_device_id'] := DashboardDeviceID.ToString; if IsDelayReplay then SimpleBOT.SimpleAI.AdditionalParameters.Values['delay_reply'] := '1'; end; if Carik.IsGroup then @@ -5414,6 +5426,7 @@ function TCarikWebModule.FormInputHandler: boolean; FCustomReplyActionTypeFromExternalNLP := 'text'; if FCustomReplyTypeFromExternalNLP.IsNotEmpty then begin + LogUtil.Add('external data not empty', 'FORM'); FCustomReplyActionTypeFromExternalNLP := FCustomReplyDataFromExternalNLP['action/type']; FCustomReplyURLFromExternalNLP := FCustomReplyDataFromExternalNLP['action/url']; FCustomReplyName := FCustomReplyDataFromExternalNLP['action/name']; @@ -5721,7 +5734,22 @@ function TCarikWebModule.FormInputHandler: boolean; FCustomReplyDataFromExternalNLP.LoadFromJsonString(httpResponse.ResultText, False); Suffix := FCustomReplyDataFromExternalNLP['text']; + // check files - taruh di sini karena konflik dengan code di bawah *1 + try + if not (FCustomReplyDataFromExternalNLP.Data.FindPath('action.files') = nil) then + begin + FIsCustomActionFileExist := True; + FCustomActionFiles := TJSONArray(GetJSON(FCustomReplyDataFromExternalNLP.Data.GetPath('action.files').AsJSON)); + end; + except + on E:Exception do + begin + //LogUtil.Add('Error: ' + E.Message, 'FORM'); + end; + end; + //TODO: build custom action + //TODO: ref *1 FCustomReplyTypeFromExternalNLP := FCustomReplyDataFromExternalNLP['type']; FCustomReplyActionTypeFromExternalNLP := 'text'; if FCustomReplyTypeFromExternalNLP.IsNotEmpty then @@ -5747,14 +5775,6 @@ function TCarikWebModule.FormInputHandler: boolean; } end; - // files - FCustomActionFiles := Nil; - try - LogUtil.Add('ada file', 'FORM'); - FCustomActionFiles := TJSONArray(FCustomReplyDataFromExternalNLP.Data.GetPath('files')); - except - end; - end; end; diff --git a/source/common/direct_handler.pas b/source/common/direct_handler.pas index cbcab23..e018105 100644 --- a/source/common/direct_handler.pas +++ b/source/common/direct_handler.pas @@ -321,7 +321,7 @@ procedure TCarikHandler.Post; LogChatPayload.Text:= Response.Content; LogChat(ChannelId, Carik.GroupChatID, Carik.GroupName, Carik.UserID, Carik.UserName, Carik.FullName, OriginalText, '', Carik.IsGroup, True); //OutputJson(11, 'muted: ' + MutedUntil.AsString); - Response.Content:= SimpleBOT.SimpleAI.ResponseJson; + Response.Content := SimpleBOT.SimpleAI.ResponseJson; Exit; end; diff --git a/source/common/telegram_handler.pas b/source/common/telegram_handler.pas index dab5bbf..4318f4a 100644 --- a/source/common/telegram_handler.pas +++ b/source/common/telegram_handler.pas @@ -479,7 +479,6 @@ procedure TTelegramHandler.Post; SimpleBOT.SessionUserID := UniqueID; SimpleBOT.FirstSessionResponse := s2b(Config[TELEGRAM_BOT_FIRST_SESSION_RESPONSE]); - // get member count deltaMember := 0; if TELEGRAM.IsGroup then @@ -489,7 +488,7 @@ procedure TTelegramHandler.Post; begin key := BotName + '_group_' + TELEGRAM.ChatID + '_count'; s := SimpleBOT.Redis[key]; - LogUtil.Add(TELEGRAM.GroupName + '; member dari db: ' + s, '#MEMBER'); + //LogUtil.Add(TELEGRAM.GroupName + '; member dari db: ' + s, '#MEMBER'); if s2i(s) <= 0 then begin LogUtil.Add(TELEGRAM.GroupName + '; set db: ' + memberCount.ToString, '#MEMBER'); @@ -497,10 +496,10 @@ procedure TTelegramHandler.Post; else begin deltaMember := memberCount - s2i(s); - if deltaMember > 0 then - LogUtil.Add(TELEGRAM.GroupName + ' member: ADD: ' + memberCount.ToString + ' ('+deltaMember.ToString+')', '#MEMBER') - else - LogUtil.Add(TELEGRAM.GroupName + ' member: ' + memberCount.ToString + ' ('+deltaMember.ToString+')', '#MEMBER'); + //if deltaMember > 0 then + // LogUtil.Add(TELEGRAM.GroupName + ' member: ADD: ' + memberCount.ToString + ' ('+deltaMember.ToString+')', '#MEMBER') + //else + // LogUtil.Add(TELEGRAM.GroupName + ' member: ' + memberCount.ToString + ' ('+deltaMember.ToString+')', '#MEMBER'); end; SimpleBOT.Redis[key] := memberCount.ToString; end; @@ -687,6 +686,7 @@ procedure TTelegramHandler.Post; begin s := Request.Content.Replace(#13,'').Replace(#10,''); LogUtil.Add(RequestAsJson.AsJSON, '> JOIN'); + LogUtil.Add(RequestAsJson.AsJSON, '> JOIN', False, AppData.logDir + 'tele-join.log'); Carik.IsInvitation := True; if IsSuspected(TELEGRAM.InvitedUserId, TELEGRAM.InvitedFullName) then @@ -775,6 +775,7 @@ procedure TTelegramHandler.Post; end else if ((Pos('spam', Text.ToLower) = 1) + or(Pos('penipuan', Text.ToLower) = 1) or(Pos('@admin', Text.ToLower) = 1) or (Text.ToLower.IsExists('/scam')) or (Text.ToLower.IsExists('/admin')) @@ -824,6 +825,7 @@ procedure TTelegramHandler.Post; begin spamScoreTotal+= SPAM_SCORE_THRESHOLD; end; + LogUtil.Add( spamScoreTotal.ToString + ': ' + RequestAsJson.AsJSON, 'FWD', False, AppData.logDir + 'forward-from-story.log'); end; if Carik.isSpamChecking or (spamScoreTotal>0) then begin @@ -857,6 +859,7 @@ procedure TTelegramHandler.Post; tmpStr := Text.ToLower; if tmpStr.IsPregMatch('^(kick|tendang)') then begin + LogUtil.Add(RequestAsJson.AsJSON, '#KICK', False, AppData.logDir + 'kick.log'); Text := '_groupkickrequest ' + TELEGRAM.ChatID + ' ' + TELEGRAM.ReplyFromID; //if TELEGRAM.ReplyFromUserName = (SimpleBOT.BotName + 'Bot') then // Text := '_gropkickwhitelisted'; @@ -1245,8 +1248,8 @@ procedure TTelegramHandler.Post; begin LogUtil.Add(TELEGRAM.ChatID + '/' + TELEGRAM.UserID + ':('+TELEGRAM.GroupName+')::' + TELEGRAM.ResultText + ' |-> ' + s, 'SENTFAILED'); end; - LogUtil.Add(TELEGRAM.ChatID + '/' + TELEGRAM.UserID + '('+TELEGRAM.GroupName+')::' + OriginalText + ' |-> ' + s, 'SENTLOG1'); - LogUtil.Add(Request.Content.Replace(#13,'').Replace(#10,''), 'SENTLOG2'); + //LogUtil.Add(TELEGRAM.ChatID + '/' + TELEGRAM.UserID + '('+TELEGRAM.GroupName+')::' + OriginalText + ' |-> ' + s, 'SENTLOG1'); + //LogUtil.Add(Request.Content.Replace(#13,'').Replace(#10,''), 'SENTLOG2'); end;// /IsCustomAction end; if AppData.debug then @@ -1315,7 +1318,13 @@ procedure TTelegramHandler.Post; begin url := SimpleBOT.SimpleAI.CustomReply['action/files['+i.ToString+']/url']; fileCaption := SimpleBOT.SimpleAI.CustomReply['action/files['+i.ToString+']/caption']; - TELEGRAM.SendAudio(TELEGRAM.ChatID, url, fileCaption, MessageID); + voiceFileName := ExtractFileName(url); + voiceFileName := preg_replace('[\d.]', '', voiceFileName); + voiceFileName := VOICE_TMP_PATH + voiceFileName.Replace('---mp', '') + ExtractFileExt(url); + if DownloadFile(url, voiceFileName) then + begin + TELEGRAM.SendAudio(TELEGRAM.ChatID, voiceFileName, fileCaption, MessageID); + end; end; if fileType = 'image' then begin From df6881ec35cc0e750fa7d0fec69499499c716711 Mon Sep 17 00:00:00 2001 From: Luri Darmawan Date: Tue, 17 Dec 2024 16:11:01 +0700 Subject: [PATCH 10/19] blacklist url --- public_html/carik/files/blacklist-url.txt | 110 ++++++++++++---------- 1 file changed, 61 insertions(+), 49 deletions(-) diff --git a/public_html/carik/files/blacklist-url.txt b/public_html/carik/files/blacklist-url.txt index e99b193..3fc0a5b 100644 --- a/public_html/carik/files/blacklist-url.txt +++ b/public_html/carik/files/blacklist-url.txt @@ -1,36 +1,48 @@ +# Telegram Bot +@majorwbot +@DinoAirdBot +@dogshouse_bot +@dogsqhouse_bot +@dogsprize_bot +@EmpirTokenxBot +@MajorAidrops_Bot +@MAJORSTORYBOT +@Notcoin_DroopBot +@PAWSQO_BOT +@SpinTetherBOT +@TetherSpinsBOT +@TondropAI_bot +@XEmpireTelegramBot +@xFreeSpinx_bot +@xtoncoinspin_bot +@xtonspin_bot +putri_aniss334 +Raymond_adminFx + +# Keyword $DOGS -AirdropMaga.lol -aply1-id.com -antgpt.org -bansos-2024.info + +# Telegram +t.me/+dIRnvlnAAd5jZjc8 +t.me/+mNW8EcFfbHw5ZTQ0 +t.me/JOIN_THE_WINNING_PROCESS +t.me/major +t.me/SecureStocks +t.me/TATTIAHOE + +# Site/Link bansosupdate2024.trustklik.live -bansos2024.info bansos2024.regist-report22.com -bantuan.us.to -best-value.ltd -byfux.win -clalm.one claim-danabansos.directklick.com claim-danabansos.sosialasia.com claimm-danabansos.smediax.online click-bansosvia-telegram.web.id cliick-informaasi-baansos2024.my.id -cpxsppk.plx-8.systems/unpkg.com -DinoAirdBot -directklick.com -dogshouse_bot -dogsqhouse_bot -dogsprize_bot -EmpirTokenxBot +cpxsppk.plx-8.systems feji.us/informasi-bansos2024t.me/mh_aripin feji.us/lapangankerja-bumn feji.us/mytelkomsel2024 -geets-cliks.com -gets-offcial.com -ghiju.us -gshortlink.com infoloker.aplly-my.com/Jobs -informasi.us.to linkin.bio/layananmo lokerbumn-2024.guirel.win lokerr-update2024.trustklik.live @@ -39,22 +51,11 @@ lowongan-kerja2024.apd-d1.com/jb lowongankerja.vrole.uk lowongankerja2024.online lowonganbumn-terbaru2024.directklick.com -kminfo.app -MajorAidrops_Bot -MAJORSTORYBOT -newsupdate.asia -Notcoin_DroopBot -PAWSQO_BOT -pendaftaranjcodonuts2024.directklick.com -pendaftaran-kerja.info-1d.com/aply1 -ppkh.site -putri_aniss334 +pendaftaran-kerja.info-1d.com qclaim-danaabnsos.smediax.com -rakyat.me/dftxrkn/?SKDCPNS2024 -Raymond_adminFx +rakyat.me/dftxrkn rekrutmenbersamabumn05.byfux.win rekrutmenbersamabumn19.byfux.win -rkyt.eu s.id/bantuansosial s.id/dtkssbans0sterupdate s.id/Loker_Update_2024 @@ -64,24 +65,35 @@ s.id/lokerterbaru s.id/rekrutsmentsbersmbumn2024isn satuin.web.id/1AVxF/?Lowongankerja2024 searchloker02.newinfo.cc -SpinTetherBOT -spoo.me -t.me/+dIRnvlnAAd5jZjc8 -t.me/+mNW8EcFfbHw5ZTQ0 -t.me/JOIN_THE_WINNING_PROCESS -t.me/major -t.me/SecureStocks -t.me/TATTIAHOE telegra.ph/Free-TON-Giveaway-11-30 -TetherSpinsBOT -TondropAI_bot +voxmn.pl/nKHr8/?LokerBUMN24 + + +# Domain/Site +AirdropMaga.lol +aply1-id.com +antgpt.org +bansos-2024.info +bansos2024.info +bantuan.us.to +best-value.ltd +byfux.win +clalm.one +directklick.com +eth-spin.lol +geets-cliks.com +gets-offcial.com +ghiju.us +gshortlink.com +informasi.us.to +kminfo.app +newsupdate.asia +ppkh.site +rkyt.eu +sosialasia.com +spoo.me tribunsinfo.cc trustklik.live vitur.me -voxmn.pl/nKHr8/?LokerBUMN24 xbeack.asia -XEmpireTelegramBot -xFreeSpinx_bot -xtoncoinspin_bot -xtonspin_bot ze-me.xyz From 3b95e2906f27df80fdf82888a09aee91430fcb90 Mon Sep 17 00:00:00 2001 From: Luri Darmawan Date: Tue, 17 Dec 2024 16:12:52 +0700 Subject: [PATCH 11/19] send voice; check spam score for forwarded message --- source/common/carik_webmodule.pas | 9 ++++++--- source/common/telegram_handler.pas | 12 ++++++++---- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/source/common/carik_webmodule.pas b/source/common/carik_webmodule.pas index bf6873e..aaa5842 100644 --- a/source/common/carik_webmodule.pas +++ b/source/common/carik_webmodule.pas @@ -3257,16 +3257,19 @@ function TCarikWebModule.SpamScore(AUserID: string; AText: string; end; jData.Free; - if Result < 80 then + if Result < SPAM_SCORE_THRESHOLD then begin // check blacklisted URL lstURL := TStringList.Create; lstURL.LoadFromFile(BLACKLIST_URL_FILENAME); for i := 0 to lstURL.Count -1 do begin - if Pos( LowerCase(lstURL[i]).Trim, AText) > 0 then + s := LowerCase(lstURL[i]).Trim; + if s.IsEmpty then Continue; + if s.IsExists('#') then Continue; + if Pos( s, AText) > 0 then begin - Result := Result + 30; + Result := Result + SPAM_SCORE_THRESHOLD; end; end; lstURL.Free diff --git a/source/common/telegram_handler.pas b/source/common/telegram_handler.pas index 4318f4a..97e8a98 100644 --- a/source/common/telegram_handler.pas +++ b/source/common/telegram_handler.pas @@ -825,6 +825,10 @@ procedure TTelegramHandler.Post; begin spamScoreTotal+= SPAM_SCORE_THRESHOLD; end; + if isBlackListed( TELEGRAM.StoryChatUsername, TELEGRAM.StoryChatId) then + begin + spamScoreTotal+= SPAM_SCORE_THRESHOLD; + end; LogUtil.Add( spamScoreTotal.ToString + ': ' + RequestAsJson.AsJSON, 'FWD', False, AppData.logDir + 'forward-from-story.log'); end; if Carik.isSpamChecking or (spamScoreTotal>0) then @@ -1130,7 +1134,7 @@ procedure TTelegramHandler.Post; s := PrepareTextToSpeech(SimpleBOT.SimpleAI.ResponseText.Text); if s <> '' then - TELEGRAM.SendAudio(TELEGRAM.ChatID, Config[CARIK_TTS_URL] + s, + TELEGRAM.SendVoice(TELEGRAM.ChatID, Config[CARIK_TTS_URL] + s, audioCaption, MessageID); end; end; @@ -1293,7 +1297,7 @@ procedure TTelegramHandler.Post; if SendAudio then begin - TELEGRAM.SendAudio(TELEGRAM.ChatID, FileURL, Caption, MessageID); + TELEGRAM.SendVoice(TELEGRAM.ChatID, FileURL, Caption, MessageID); end; if SendPhoto then @@ -1323,7 +1327,7 @@ procedure TTelegramHandler.Post; voiceFileName := VOICE_TMP_PATH + voiceFileName.Replace('---mp', '') + ExtractFileExt(url); if DownloadFile(url, voiceFileName) then begin - TELEGRAM.SendAudio(TELEGRAM.ChatID, voiceFileName, fileCaption, MessageID); + TELEGRAM.SendVoice(TELEGRAM.ChatID, voiceFileName, fileCaption, MessageID); end; end; if fileType = 'image' then @@ -1352,7 +1356,7 @@ procedure TTelegramHandler.Post; fileType := CustomActionFiles.Items[i].GetPath('type').AsString; fileCaption := CustomActionFiles.Items[i].GetPath('caption').AsString; if fileType = 'audio' then - TELEGRAM.SendAudio(TELEGRAM.ChatID, url, fileCaption, MessageID); + TELEGRAM.SendVoice(TELEGRAM.ChatID, url, fileCaption, MessageID); end; end; From 8650302369ce928817b4d28d362ed7ca7ab91f72 Mon Sep 17 00:00:00 2001 From: Luri Darmawan Date: Tue, 24 Dec 2024 14:06:56 +0700 Subject: [PATCH 12/19] add blacklist; add word standard --- public_html/carik/files/blacklist-url.txt | 2 ++ public_html/carik/files/word-standard.txt | 1 + 2 files changed, 3 insertions(+) diff --git a/public_html/carik/files/blacklist-url.txt b/public_html/carik/files/blacklist-url.txt index 3fc0a5b..9bca891 100644 --- a/public_html/carik/files/blacklist-url.txt +++ b/public_html/carik/files/blacklist-url.txt @@ -6,6 +6,7 @@ @dogsprize_bot @EmpirTokenxBot @MajorAidrops_Bot +@MajorAllBot @MAJORSTORYBOT @Notcoin_DroopBot @PAWSQO_BOT @@ -85,6 +86,7 @@ geets-cliks.com gets-offcial.com ghiju.us gshortlink.com +heylink.me informasi.us.to kminfo.app newsupdate.asia diff --git a/public_html/carik/files/word-standard.txt b/public_html/carik/files/word-standard.txt index f402484..9a7c679 100644 --- a/public_html/carik/files/word-standard.txt +++ b/public_html/carik/files/word-standard.txt @@ -9513,6 +9513,7 @@ indologi indonesia indonesianisasi indra +indraja indraloka indranila indriawi From aa914d3bb6f97aeaf63af1a54a4eaf758ee3aa0e Mon Sep 17 00:00:00 2001 From: Luri Darmawan Date: Tue, 24 Dec 2024 14:10:36 +0700 Subject: [PATCH 13/19] Ask to ExternalNLP when Formula not recognized, replace messageid var, add dashboard device id, change group_name variable --- source/common/carik_webmodule.pas | 8 ++++++-- source/common/direct_handler.pas | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/source/common/carik_webmodule.pas b/source/common/carik_webmodule.pas index aaa5842..d3ffc41 100644 --- a/source/common/carik_webmodule.pas +++ b/source/common/carik_webmodule.pas @@ -2611,6 +2611,8 @@ function TCarikWebModule.customMathHandler(const IntentName: string; Result := Format(FFormatNumber,[resultValue]); Result := Result.Replace(',000',''); except + Result := ExternalNLP('berapa '+Params.Values['Formula_value']); + if Result.IsEmpty then Result := 'duuhh... saya bingung dehh.. '; end; mathParser.Free; end; @@ -4509,17 +4511,19 @@ procedure TCarikWebModule.LogChat(AChannelID: string; AGroupID: string; begin requestJson['client_id'] := FClientId; end; - requestJson['message/message_id'] := AMessageID.ToString; + requestJson['message/message_id'] := MessageID; requestJson['message/text'] := (AText); requestJson['message/reply'] := (AReply); requestJson['message/from/id'] := AUserID; requestJson['message/from/name'] := AFullName; requestJson['message/from/username'] := AUserName; requestJson['message/chat/channel'] := AChannelID; - requestJson['message/chat/id'] := AMessageID.ToString; + requestJson['message/chat/id'] := MessageID; requestJson['message/chat/is_mentioned'] := is_mentioned; requestJson['message/chat/is_group'] := is_group; requestJson['message/intents/name'] := SimpleBOT.SimpleAI.IntentName; + requestJson['message/dashboard_device_id'] := DashboardDeviceID; + if AReplyFromMessageId > 0 then requestJson['message/chat/is_reply'] := 0; if AIsGroup then begin diff --git a/source/common/direct_handler.pas b/source/common/direct_handler.pas index e018105..ca49ca0 100644 --- a/source/common/direct_handler.pas +++ b/source/common/direct_handler.pas @@ -111,7 +111,7 @@ procedure TCarikHandler.Post; if Text = 'False' then Text := ''; - messageID := jsonData.Value['message/message_id']; + MessageID := jsonData.Value['message/message_id']; chatID := jsonData.Value['message/chat/id']; chatType := jsonData.Value['message/chat/type']; groupID := jsonData.Value['message/chat/group_id']; @@ -210,8 +210,12 @@ procedure TCarikHandler.Post; SimpleBOT.FirstSessionResponse := s2b(Config[CONFIG_FIRST_SESSION_RESPONSE]); try - Carik.GroupName := jsonData.GetPath('message.chat.title').AsString; + Carik.GroupName := jsonData.GetPath('message.chat.group_name').AsString; except + try + Carik.GroupName := jsonData.GetPath('message.chat.title').AsString; + except + end; end; Carik.UserPrefix := channelID; From af068dd3202cef1708e8170d2d74f2fa73c55909 Mon Sep 17 00:00:00 2001 From: Luri Darmawan Date: Tue, 7 Jan 2025 09:04:49 +0700 Subject: [PATCH 14/19] update blacklist --- public_html/carik/files/blacklist-url.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public_html/carik/files/blacklist-url.txt b/public_html/carik/files/blacklist-url.txt index 9bca891..03f8f94 100644 --- a/public_html/carik/files/blacklist-url.txt +++ b/public_html/carik/files/blacklist-url.txt @@ -5,18 +5,23 @@ @dogsqhouse_bot @dogsprize_bot @EmpirTokenxBot +@lacaknomer_bot @MajorAidrops_Bot @MajorAllBot @MAJORSTORYBOT @Notcoin_DroopBot +@Notcoin_luckybot +@PAWSOG_nbot @PAWSQO_BOT @SpinTetherBOT @TetherSpinsBOT @TondropAI_bot +@TONEWYERBOT @XEmpireTelegramBot @xFreeSpinx_bot @xtoncoinspin_bot @xtonspin_bot +@XTONCHRISTMASBOT putri_aniss334 Raymond_adminFx From 7f93db32ef912ab65c0f9f0044fa0d02849dd119 Mon Sep 17 00:00:00 2001 From: Luri Darmawan Date: Fri, 10 Jan 2025 10:00:24 +0700 Subject: [PATCH 15/19] update blacklist --- public_html/carik/files/blacklist-url.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public_html/carik/files/blacklist-url.txt b/public_html/carik/files/blacklist-url.txt index 03f8f94..92a5ae5 100644 --- a/public_html/carik/files/blacklist-url.txt +++ b/public_html/carik/files/blacklist-url.txt @@ -10,6 +10,7 @@ @MajorAllBot @MAJORSTORYBOT @Notcoin_DroopBot +@Notcoin_litebot @Notcoin_luckybot @PAWSOG_nbot @PAWSQO_BOT @@ -27,6 +28,7 @@ Raymond_adminFx # Keyword $DOGS +listrikgratis # Telegram t.me/+dIRnvlnAAd5jZjc8 @@ -79,6 +81,7 @@ voxmn.pl/nKHr8/?LokerBUMN24 AirdropMaga.lol aply1-id.com antgpt.org +best-value.ltd bansos-2024.info bansos2024.info bantuan.us.to @@ -93,9 +96,11 @@ ghiju.us gshortlink.com heylink.me informasi.us.to +klikhere.website kminfo.app newsupdate.asia ppkh.site +register2024.live rkyt.eu sosialasia.com spoo.me From 791a495cf664c1dec8d50b15f2dacd516128bdbb Mon Sep 17 00:00:00 2001 From: Luri Darmawan Date: Sun, 12 Jan 2025 04:34:39 +0700 Subject: [PATCH 16/19] add blacklist --- public_html/carik/files/blacklist-url.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/public_html/carik/files/blacklist-url.txt b/public_html/carik/files/blacklist-url.txt index 92a5ae5..d68e228 100644 --- a/public_html/carik/files/blacklist-url.txt +++ b/public_html/carik/files/blacklist-url.txt @@ -12,6 +12,8 @@ @Notcoin_DroopBot @Notcoin_litebot @Notcoin_luckybot +@Notcoin_moonbot +@Notcoin @PAWSOG_nbot @PAWSQO_BOT @SpinTetherBOT @@ -106,6 +108,7 @@ sosialasia.com spoo.me tribunsinfo.cc trustklik.live +uasx11.com vitur.me xbeack.asia ze-me.xyz From 7b806450dd12c533223cecde13d2b26fe1c83220 Mon Sep 17 00:00:00 2001 From: Luri Darmawan Date: Tue, 14 Jan 2025 08:56:50 +0700 Subject: [PATCH 17/19] update blacklist --- public_html/carik/files/blacklist-url.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/public_html/carik/files/blacklist-url.txt b/public_html/carik/files/blacklist-url.txt index d68e228..e75677f 100644 --- a/public_html/carik/files/blacklist-url.txt +++ b/public_html/carik/files/blacklist-url.txt @@ -22,6 +22,7 @@ @TONEWYERBOT @XEmpireTelegramBot @xFreeSpinx_bot +@XTONXEBOT @xtoncoinspin_bot @xtonspin_bot @XTONCHRISTMASBOT From 8cacf12b4d9b72220d95a625d61c48f74e242b2f Mon Sep 17 00:00:00 2001 From: Luri Darmawan Date: Tue, 14 Jan 2025 10:14:00 +0700 Subject: [PATCH 18/19] autokick unfit user --- public_html/carik/files/blacklist-url.txt | 1 + source/common/telegram_handler.pas | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/public_html/carik/files/blacklist-url.txt b/public_html/carik/files/blacklist-url.txt index e75677f..e7f7694 100644 --- a/public_html/carik/files/blacklist-url.txt +++ b/public_html/carik/files/blacklist-url.txt @@ -105,6 +105,7 @@ newsupdate.asia ppkh.site register2024.live rkyt.eu +site-klik.com sosialasia.com spoo.me tribunsinfo.cc diff --git a/source/common/telegram_handler.pas b/source/common/telegram_handler.pas index 97e8a98..8c90a92 100644 --- a/source/common/telegram_handler.pas +++ b/source/common/telegram_handler.pas @@ -699,6 +699,9 @@ procedure TTelegramHandler.Post; Suffix := '\n[Halo '+TELEGRAM.InvitedFullName+'](tg://user?id='+ TELEGRAM.InvitedUserId + ') silakan ubah nama anda yang lebih familiar dibaca agar tidak dianggap sebagai spammer.\n'; + //TODO: if autokick Unfit User + TELEGRAM.KickUser(TELEGRAM.ChatID, TELEGRAM.UserID, 'unfit user'); + end; if not isSapaMemberBaru(TELEGRAM.ChatID) then @@ -775,6 +778,7 @@ procedure TTelegramHandler.Post; end else if ((Pos('spam', Text.ToLower) = 1) + or(Pos('scam', Text.ToLower) = 1) or(Pos('penipuan', Text.ToLower) = 1) or(Pos('@admin', Text.ToLower) = 1) or (Text.ToLower.IsExists('/scam')) From 0ecb13aeef83f5b1861c7e901e1cab306d14b5c3 Mon Sep 17 00:00:00 2001 From: Luri Darmawan Date: Tue, 18 Feb 2025 16:42:29 +0700 Subject: [PATCH 19/19] add blacklist --- public_html/carik/files/blacklist-url.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/public_html/carik/files/blacklist-url.txt b/public_html/carik/files/blacklist-url.txt index e7f7694..5d6d150 100644 --- a/public_html/carik/files/blacklist-url.txt +++ b/public_html/carik/files/blacklist-url.txt @@ -1,5 +1,6 @@ # Telegram Bot @majorwbot +@BiggesTonBot @DinoAirdBot @dogshouse_bot @dogsqhouse_bot @@ -88,6 +89,7 @@ best-value.ltd bansos-2024.info bansos2024.info bantuan.us.to +bantuanbansospkh.net best-value.ltd byfux.win clalm.one @@ -98,14 +100,18 @@ gets-offcial.com ghiju.us gshortlink.com heylink.me +indodock.com +info-ind.com informasi.us.to klikhere.website kminfo.app newsupdate.asia ppkh.site register2024.live +rakyat.me rkyt.eu site-klik.com +st-rg.com sosialasia.com spoo.me tribunsinfo.cc