commit e3a7d6b53e2e87ecc4d7453055e8b13fb6e6b7c4 · anil.recoil.org/slop

+3 -11

stack/zulip/examples/echo_bot.ml

···

       22
        
            Send me a direct message or mention me in a channel."

     

       23
        
       

     

       24
        
         let handle_message ~config:_ ~storage ~identity ~message ~env:_ =

     

       25
       -
           Log.debug (fun m -> m "Received message for processing");

     

       0
        
       
     

       26
        
       

     

       27
        
           (* Use the new Message type for cleaner handling *)

     

       28
        
           match message with

     

       29
        
           | Message.Private { common; display_recipient = _ } ->

     

       30
       -
               Log.info (fun m -> m "Processing private message from %s (ID: %d)"

     

       31
       -
                 common.sender_email common.id);

     

       32
        
       

     

       33
        
               (* Check if this is our own message to avoid loops *)

     

       34
        
               let bot_email = Bot_handler.Identity.email identity in

     
···

       38
        
               ) else

     

       39
        
                 (* Process the message content *)

     

       40
        
                 let sender_name = common.sender_full_name in

     

       41
       -
                 let sender_id = common.sender_id in

     

       42
       -
                 let msg = common.content in

     

       43
       -
       

     

       44
       -
                 Log.info (fun m -> m "Processing message from %s (ID: %d): %s" sender_name sender_id msg);

     

       45
        
       

     

       46
        
                 (* Remove bot mention using Message utility *)

     

       47
        
                 let bot_email = Bot_handler.Identity.email identity in

     
···

       124
        
                 Log.info (fun m -> m "Sending private reply");

     

       125
        
                 Ok (Bot_handler.Response.Reply response_content)

     

       126
        
       

     

       127
       -
           | Message.Stream { common; display_recipient; subject; _ } ->

     

       128
       -
               Log.info (fun m -> m "Processing stream message from %s in %s/%s"

     

       129
       -
                 common.sender_email display_recipient subject);

     

       130
       -
       

     

       131
        
               (* Check if this is our own message to avoid loops *)

     

       132
        
               let bot_email = Bot_handler.Identity.email identity in

     

       133
        
               if common.sender_email = bot_email then (

···

       22
        
            Send me a direct message or mention me in a channel."

     

       23
        
       

     

       24
        
         let handle_message ~config:_ ~storage ~identity ~message ~env:_ =

     

       25
       +
           (* Log the message with colorful formatting *)

     

       26
       +
           Log.debug (fun m -> m "@[<h>Received: %a@]" (Message.pp_ansi ~show_json:false) message);

     

       27
        
       

     

       28
        
           (* Use the new Message type for cleaner handling *)

     

       29
        
           match message with

     

       30
        
           | Message.Private { common; display_recipient = _ } ->

     

       0
        
       
     

       0
        
       
     

       31
        
       

     

       32
        
               (* Check if this is our own message to avoid loops *)

     

       33
        
               let bot_email = Bot_handler.Identity.email identity in

     
···

       37
        
               ) else

     

       38
        
                 (* Process the message content *)

     

       39
        
                 let sender_name = common.sender_full_name in

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       40
        
       

     

       41
        
                 (* Remove bot mention using Message utility *)

     

       42
        
                 let bot_email = Bot_handler.Identity.email identity in

     
···

       119
        
                 Log.info (fun m -> m "Sending private reply");

     

       120
        
                 Ok (Bot_handler.Response.Reply response_content)

     

       121
        
       

     

       122
       +
           | Message.Stream { common; display_recipient = _; subject = _; _ } ->

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       123
        
               (* Check if this is our own message to avoid loops *)

     

       124
        
               let bot_email = Bot_handler.Identity.email identity in

     

       125
        
               if common.sender_email = bot_email then (

+6 -1

stack/zulip/lib/zulip_bot/lib/bot_runner.ml

···

       70
        
             (match Message.of_json (convert_json message_json) with

     

       71
        
              | Error err ->

     

       72
        
                  Log.err (fun m -> m "Failed to parse message JSON: %s" err);

     

       0
        
       
     

       0
        
       
     

       73
        
              | Ok message ->

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       74
        
                  (* Get bot identity for checking mentions *)

     

       75
        
                  let bot_email = Bot_handler.Identity.email (Bot_handler.identity t.handler) in

     

       76
        
       

     
···

       86
        
                  let is_from_self = Message.is_from_email message ~email:bot_email in

     

       87
        
       

     

       88
        
                  (* Log what we found *)

     

       89
       -
                  Log.info (fun m -> m "Message check: mentioned=%b, private=%b, from_self=%b"

     

       90
        
                    is_mentioned is_private is_from_self);

     

       91
        
       

     

       92
        
                  (* Only process if bot was mentioned or it's a private message, and not from self *)

···

       70
        
             (match Message.of_json (convert_json message_json) with

     

       71
        
              | Error err ->

     

       72
        
                  Log.err (fun m -> m "Failed to parse message JSON: %s" err);

     

       73
       +
                  (* Show raw JSON for debugging *)

     

       74
       +
                  Log.debug (fun m -> m "@[%a@]" Message.pp_json_debug (convert_json message_json));

     

       75
        
              | Ok message ->

     

       76
       +
                  (* Log the parsed message with colors *)

     

       77
       +
                  Log.info (fun m -> m "@[<h>%a@]" (Message.pp_ansi ~show_json:false) message);

     

       78
       +
       

     

       79
        
                  (* Get bot identity for checking mentions *)

     

       80
        
                  let bot_email = Bot_handler.Identity.email (Bot_handler.identity t.handler) in

     

       81
        
       

     
···

       91
        
                  let is_from_self = Message.is_from_email message ~email:bot_email in

     

       92
        
       

     

       93
        
                  (* Log what we found *)

     

       94
       +
                  Log.debug (fun m -> m "Message check: mentioned=%b, private=%b, from_self=%b"

     

       95
        
                    is_mentioned is_private is_from_self);

     

       96
        
       

     

       97
        
                  (* Only process if bot was mentioned or it's a private message, and not from self *)

+1 -1

stack/zulip/lib/zulip_bot/lib/dune

···

       1
        
       (library

     

       2
        
        (public_name zulip_bot)

     

       3
        
        (name zulip_bot)

     

       4
       -
        (libraries zulip unix eio logs mirage-crypto-rng)

     

       5
        
        (flags (:standard -warn-error -3)))

···

       1
        
       (library

     

       2
        
        (public_name zulip_bot)

     

       3
        
        (name zulip_bot)

     

       4
       +
        (libraries zulip unix eio logs mirage-crypto-rng fmt)

     

       5
        
        (flags (:standard -warn-error -3)))

+50 -3

stack/zulip/lib/zulip_bot/lib/message.ml

···

       262
        
         in

     

       263
        
         let username_mention = "@**" ^ username ^ "**" in

     

       264
        
       

     

       265
       -
         let rec contains text pattern =

     

       266
        
           if String.length pattern = 0 || String.length pattern > String.length text then

     

       267
        
             false

     

       268
        
           else

     
···

       276
        
             in

     

       277
        
             search_from 0

     

       278
        
         in

     

       279
       -
       

     

       280
        
         contains content_text email_mention || contains content_text username_mention

     

       281
        
       

     

       282
        
       let strip_mention msg ~user_email =

     
···

       342
        
       

     

       343
        
         | Unknown { common; _ } ->

     

       344
        
           Format.fprintf fmt "Unknown { id=%d; sender=%s; content=%S }"

     

       345
       -
             common.id common.sender_email common.content
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0

···

       262
        
         in

     

       263
        
         let username_mention = "@**" ^ username ^ "**" in

     

       264
        
       

     

       265
       +
         let contains text pattern =

     

       266
        
           if String.length pattern = 0 || String.length pattern > String.length text then

     

       267
        
             false

     

       268
        
           else

     
···

       276
        
             in

     

       277
        
             search_from 0

     

       278
        
         in

     

       0
        
       
     

       279
        
         contains content_text email_mention || contains content_text username_mention

     

       280
        
       

     

       281
        
       let strip_mention msg ~user_email =

     
···

       341
        
       

     

       342
        
         | Unknown { common; _ } ->

     

       343
        
           Format.fprintf fmt "Unknown { id=%d; sender=%s; content=%S }"

     

       344
       +
             common.id common.sender_email common.content

     

       345
       +
       

     

       346
       +
       (** ANSI colored pretty printing for debugging *)

     

       347
       +
       let pp_ansi ?(show_json=false) ppf msg =

     

       348
       +
         let open Fmt in

     

       349
       +
         let blue = styled `Blue string in

     

       350
       +
         let green = styled `Green string in

     

       351
       +
         let yellow = styled `Yellow string in

     

       352
       +
         let magenta = styled `Magenta string in

     

       353
       +
         let cyan = styled `Cyan string in

     

       354
       +
         let dim = styled (`Fg `Black) string in

     

       355
       +
       

     

       356
       +
         match msg with

     

       357
       +
         | Private { common; display_recipient } ->

     

       358
       +
             pf ppf "%a %a %a %a %a"

     

       359
       +
               (styled `Bold blue) "DM"

     

       360
       +
               dim (Printf.sprintf "[#%d]" common.id)

     

       361
       +
               (styled `Cyan string) common.sender_email

     

       362
       +
               dim "→"

     

       363
       +
               green (Printf.sprintf "%S" common.content);

     

       364
       +
             if show_json then

     

       365
       +
               pf ppf "@.  %a %a" dim "Recipients:"

     

       366
       +
                 (list ~sep:(const string ", ") (fun fmt u -> cyan fmt (User.email u)))

     

       367
       +
                 display_recipient

     

       368
       +
       

     

       369
       +
         | Stream { common; display_recipient; subject; _ } ->

     

       370
       +
             pf ppf "%a %a %a%a%a %a %a"

     

       371
       +
               (styled `Bold yellow) "STREAM"

     

       372
       +
               dim (Printf.sprintf "[#%d]" common.id)

     

       373
       +
               magenta display_recipient

     

       374
       +
               dim "/"

     

       375
       +
               cyan subject

     

       376
       +
               (styled `Cyan string) common.sender_email

     

       377
       +
               green (Printf.sprintf "%S" common.content)

     

       378
       +
       

     

       379
       +
         | Unknown { common; _ } ->

     

       380
       +
             pf ppf "%a %a %a %a"

     

       381
       +
               (styled `Bold (styled (`Fg `Red) string)) "UNKNOWN"

     

       382
       +
               dim (Printf.sprintf "[#%d]" common.id)

     

       383
       +
               (styled `Cyan string) common.sender_email

     

       384
       +
               (styled (`Fg `Red) string) (Printf.sprintf "%S" common.content)

     

       385
       +
       

     

       386
       +
       (** Pretty print JSON for debugging *)

     

       387
       +
       let pp_json_debug ppf json =

     

       388
       +
         let open Fmt in

     

       389
       +
         let json_str = Yojson.Safe.pretty_to_string json in

     

       390
       +
         pf ppf "@[<v>%a@.%a@]"

     

       391
       +
           (styled `Bold (styled (`Fg `Blue) string)) "Raw JSON:"

     

       392
       +
           (styled (`Fg `Black) string) json_str

+7 -1

stack/zulip/lib/zulip_bot/lib/message.mli

···

       100
        
       val of_json : Yojson.Safe.t -> (t, string) result

     

       101
        
       

     

       102
        
       (** Pretty printing *)

     

       103
       -
       val pp : Format.formatter -> t -> unit
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0

···

       100
        
       val of_json : Yojson.Safe.t -> (t, string) result

     

       101
        
       

     

       102
        
       (** Pretty printing *)

     

       103
       +
       val pp : Format.formatter -> t -> unit

     

       104
       +
       

     

       105
       +
       (** ANSI colored pretty printing for debugging *)

     

       106
       +
       val pp_ansi : ?show_json:bool -> Format.formatter -> t -> unit

     

       107
       +
       

     

       108
       +
       (** Pretty print JSON for debugging *)

     

       109
       +
       val pp_json_debug : Format.formatter -> Yojson.Safe.t -> unit