synapse 2.187.0__py311-none-any.whl → 2.188.1__py311-none-any.whl

synapse/lib/scrape.py

@@ -24,8 +24,6 @@ ipaddress = s_common.ipaddress
 
 logger = logging.getLogger(__name__)
 
-SCRAPE_SPAWN_LENGTH = 5000
-
 tldlist = list(s_data.get('iana.tlds'))
 tldlist.extend([
     'bit',
@@ -445,6 +443,9 @@ def _rewriteRawValu(text: str, offsets: dict, info: dict):
     info['match'] = match
     info['offset'] = baseoff + offset
 
+def _genMatchList(text: str, regx: regex.Regex, opts: dict):
+    return [info for info in _genMatches(text, regx, opts)]
+
 def _genMatches(text: str, regx: regex.Regex, opts: dict):
 
     cb = opts.get('callback')
@@ -504,23 +505,9 @@ def genMatches(text: str, regx: regex.Regex, opts: dict):
     for match in _genMatches(text, regx, opts):
         yield match
 
-def _spawn_genmatches(sock, text, regx, opts): # pragma: no cover
-    '''
-    Multiprocessing target for generating matches.
-    '''
-    try:
-        for info in _genMatches(text, regx, opts):
-            sock.sendall(s_msgpack.en((True, info)))
-
-        sock.sendall(s_msgpack.en((True, None)))
-
-    except Exception as e:
-        mesg = s_common.retnexc(e)
-        sock.sendall(s_msgpack.en(mesg))
-
 async def genMatchesAsync(text: str, regx: regex.Regex, opts: dict):
     '''
-    Generate regular expression matches for a blob of text, potentially in a spawned process.
+    Generate regular expression matches for a blob of text, using the shared forked process pool.
 
     Args:
         text (str): The text to generate matches for.
@@ -547,30 +534,9 @@ async def genMatchesAsync(text: str, regx: regex.Regex, opts: dict):
     Yields:
         dict: A dictionary of match results.
     '''
-    if len(text) < SCRAPE_SPAWN_LENGTH:
-        for match in _genMatches(text, regx, opts):
-            yield match
-        return
-
-    link00, sock00 = await s_link.linksock()
-
-    try:
-        async with link00:
-
-            todo = s_common.todo(_spawn_genmatches, sock00, text, regx, opts)
-            link00.schedCoro(s_coro.spawn(todo, log_conf=s_common._getLogConfFromEnv()))
-
-            while (mesg := await link00.rx()) is not None:
-
-                info = s_common.result(mesg)
-                if info is None:
-                    return
-
-                yield info
-
-    finally:
-        sock00.close()
-
+    matches = await s_coro.semafork(_genMatchList, text, regx, opts)
+    for info in matches:
+        yield info
 
 def _contextMatches(scrape_text, text, ruletype, refang, offsets):
 
@@ -585,33 +551,16 @@ def _contextMatches(scrape_text, text, ruletype, refang, offsets):
 
                 yield info
 
-def _contextScrape(text, form=None, refang=True, first=False):
-    scrape_text = text
-    offsets = {}
-    if refang:
-        scrape_text, offsets = refang_text2(text)
-
-    for ruletype, blobs in _regexes.items():
-        if form and form != ruletype:
-            continue
+def _contextScrapeList(text, form=None, refang=True, first=False):
+    return [info for info in _contextScrape(text, form=form, refang=refang, first=first)]
 
-        for info in _contextMatches(scrape_text, text, ruletype, refang, offsets):
-
-            yield info
-
-            if first:
-                return
-
-async def _contextScrapeAsync(text, form=None, refang=True, first=False):
+def _contextScrape(text, form=None, refang=True, first=False):
     scrape_text = text
     offsets = {}
     if refang:
         scrape_text, offsets = refang_text2(text)
 
     for ruletype, blobs in _regexes.items():
-
-        await asyncio.sleep(0)
-
         if form and form != ruletype:
             continue
 
@@ -666,27 +615,12 @@ def scrape(text, ptype=None, refang=True, first=False):
     Returns:
         (str, object): Yield tuples of node ndef values.
     '''
-
-    for info in contextScrape(text, form=ptype, refang=refang, first=first):
+    for info in _contextScrape(text, form=ptype, refang=refang, first=first):
         yield info.get('form'), info.get('valu')
 
-def _spawn_scrape(sock, text, form=None, refang=True, first=False): # pragma: no cover
-    '''
-    Multiprocessing target for scraping text.
-    '''
-    try:
-        for info in _contextScrape(text, form=form, refang=refang, first=first):
-            sock.sendall(s_msgpack.en((True, info)))
-
-        sock.sendall(s_msgpack.en((True, None)))
-
-    except Exception as e:
-        mesg = s_common.retnexc(e)
-        sock.sendall(s_msgpack.en(mesg))
-
 async def contextScrapeAsync(text, form=None, refang=True, first=False):
     '''
-    Scrape types from a blob of text and yield info dictionaries, potentially in a spawned process.
+    Scrape types from a blob of text and yield info dictionaries, using the shared forked process pool.
 
     Args:
         text (str): Text to scrape.
@@ -712,33 +646,13 @@ async def contextScrapeAsync(text, form=None, refang=True, first=False):
     Returns:
         (dict): Yield info dicts of results.
     '''
-    if len(text) < SCRAPE_SPAWN_LENGTH:
-        async for info in _contextScrapeAsync(text, form=form, refang=refang, first=first):
-            yield info
-        return
-
-    link00, sock00 = await s_link.linksock()
-
-    try:
-        async with link00:
-
-            todo = s_common.todo(_spawn_scrape, sock00, text, form=form, refang=refang, first=first)
-            link00.schedCoro(s_coro.spawn(todo, log_conf=s_common._getLogConfFromEnv()))
-
-            while (mesg := await link00.rx()) is not None:
-
-                info = s_common.result(mesg)
-                if info is None:
-                    return
-
-                yield info
-
-    finally:
-        sock00.close()
+    matches = await s_coro.semafork(_contextScrapeList, text, form=form, refang=refang, first=first)
+    for info in matches:
+        yield info
 
 async def scrapeAsync(text, ptype=None, refang=True, first=False):
     '''
-    Scrape types from a blob of text and return node tuples, potentially in a spawned process.
+    Scrape types from a blob of text and return node tuples, using the shared forked process pool.
 
     Args:
         text (str): Text to scrape.
@@ -749,6 +663,6 @@ async def scrapeAsync(text, ptype=None, refang=True, first=False):
     Returns:
         (str, object): Yield tuples of node ndef values.
     '''
-
-    async for info in contextScrapeAsync(text, form=ptype, refang=refang, first=first):
+    matches = await s_coro.semafork(_contextScrapeList, text, form=ptype, refang=refang, first=first)
+    for info in matches:
         yield info.get('form'), info.get('valu')

synapse/lib/storm.py

@@ -1357,30 +1357,42 @@ stormcmds = (
         'descr': "List existing cron jobs in the cortex.",
         'cmdargs': (),
         'storm': '''
+            init {
+                $conf = ({
+                    "columns": [
+                        {"name": "user", "width": 24},
+                        {"name": "iden", "width": 10},
+                        {"name": "view", "width": 10},
+                        {"name": "en?", "width": 3},
+                        {"name": "rpt?", "width": 4},
+                        {"name": "now?", "width": 4},
+                        {"name": "err?", "width": 4},
+                        {"name": "# start", "width": 7},
+                        {"name": "last start", "width": 16},
+                        {"name": "last end", "width": 16},
+                        {"name": "query", "newlines": "split"},
+                    ],
+                    "separators": {
+                        "row:outline": false,
+                        "column:outline": false,
+                        "header:row": "#",
+                        "data:row": "",
+                        "column": "",
+                        },
+                })
+                $printer = $lib.tabular.printer($conf)
+            }
             $crons = $lib.cron.list()
-
             if $crons {
-                $lib.print("user       iden       view       en? rpt? now? err? # start last start       last end         query")
-
+                $lib.print($printer.header())
                 for $cron in $crons {
-
                     $job = $cron.pprint()
-
-                    $user = $job.user.ljust(10)
-                    $view = $job.viewshort.ljust(10)
-                    $iden = $job.idenshort.ljust(10)
-                    $enabled = $job.enabled.ljust(3)
-                    $isrecur = $job.isrecur.ljust(4)
-                    $isrunning = $job.isrunning.ljust(4)
-                    $iserr = $job.iserr.ljust(4)
-                    $startcount = $lib.str.format("{startcount}", startcount=$job.startcount).ljust(7)
-                    $laststart = $job.laststart.ljust(16)
-                    $lastend = $job.lastend.ljust(16)
-
-       $lib.print("{user} {iden} {view} {enabled} {isrecur} {isrunning} {iserr} {startcount} {laststart} {lastend} {query}",
-                               user=$user, iden=$iden, view=$view, enabled=$enabled, isrecur=$isrecur,
-                               isrunning=$isrunning, iserr=$iserr, startcount=$startcount,
-                               laststart=$laststart, lastend=$lastend, query=$job.query)
+                    $row = (
+                        $job.user, $job.idenshort, $job.viewshort, $job.enabled,
+                        $job.isrecur, $job.isrunning, $job.iserr, `{$job.startcount}`,
+                        $job.laststart, $job.lastend, $job.query
+                    )
+                    $lib.print($printer.row($row))
                 }
             } else {
                 $lib.print("No cron jobs found")
@@ -5268,6 +5280,13 @@ class BackgroundCmd(Cmd):
         async for item in genr:
             yield item
 
+        _query = await s_stormtypes.tostr(self.opts.query)
+        query = await runt.getStormQuery(_query)
+
+        # make sure the subquery *could* have run
+        async with runt.getSubRuntime(query) as subr:
+            query.validate(subr)
+
         runtprims = await s_stormtypes.toprim(self.runt.getScopeVars(), use_list=True)
         runtvars = {k: v for (k, v) in runtprims.items() if s_msgpack.isok(v)}
 
@@ -5277,12 +5296,6 @@ class BackgroundCmd(Cmd):
             'vars': runtvars,
         }
 
-        _query = await s_stormtypes.tostr(self.opts.query)
-        query = await runt.getStormQuery(_query)
-
-        # make sure the subquery *could* have run with existing vars
-        query.validate(runt)
-
         coro = self.execStormTask(query, opts)
         runt.snap.core.schedCoro(coro)
 
@@ -5339,9 +5352,12 @@ class ParallelCmd(Cmd):
             raise s_exc.StormRuntimeError(mesg=mesg)
 
         size = await s_stormtypes.toint(self.opts.size)
-        query = await runt.getStormQuery(self.opts.query)
 
-        query.validate(runt)
+        _query = await s_stormtypes.tostr(self.opts.query)
+        query = await runt.getStormQuery(_query)
+
+        async with runt.getSubRuntime(query) as subr:
+            query.validate(subr)
 
         async with await s_base.Base.anit() as base:
 

synapse/lib/stormlib/modelext.py

@@ -105,6 +105,21 @@ class LibModelExt(s_stormtypes.Lib):
                        'desc': 'The form of the n2 node. May be "*" or null to specify "any".'},
                   ),
                   'returns': {'type': 'null'}}},
+        {'name': 'addType', 'desc': 'Add an extended type definition to the data model.',
+         'type': {'type': 'function', '_funcname': 'addType',
+                  'args': (
+                      {'name': 'typename', 'type': 'str', 'desc': 'The name of the type to add.'},
+                      {'name': 'basetype', 'type': 'str', 'desc': 'The base type the type is derived from.'},
+                      {'name': 'typeopts', 'type': 'dict', 'desc': 'A Synapse type opts dictionary.'},
+                      {'name': 'typeinfo', 'type': 'dict', 'desc': 'A Synapse type info dictionary.'},
+                  ),
+                  'returns': {'type': 'null'}}},
+        {'name': 'delType', 'desc': 'Remove an extended type definition from the model.',
+         'type': {'type': 'function', '_funcname': 'delType',
+                  'args': (
+                      {'name': 'typename', 'type': 'str', 'desc': 'The extended type to remove.'},
+                  ),
+                  'returns': {'type': 'null'}}},
     )
     _storm_lib_path = ('model', 'ext')
 
@@ -122,6 +137,8 @@ class LibModelExt(s_stormtypes.Lib):
             'addExtModel': self.addExtModel,
             'addEdge': self.addEdge,
             'delEdge': self.delEdge,
+            'addType': self.addType,
+            'delType': self.delType,
         }
 
     # TODO type docs in the new convention
@@ -210,6 +227,7 @@ class LibModelExt(s_stormtypes.Lib):
         return await self.runt.snap.core.getExtModel()
 
     async def addExtModel(self, model):
+        self.runt.reqAdmin()
         model = await s_stormtypes.toprim(model)
         return await self.runt.snap.core.addExtModel(model)
 
@@ -249,3 +267,16 @@ class LibModelExt(s_stormtypes.Lib):
 
         s_stormtypes.confirm(('model', 'edge', 'del'))
         await self.runt.snap.core.delEdge((n1form, verb, n2form))
+
+    async def addType(self, typename, basetype, typeopts, typeinfo):
+        typename = await s_stormtypes.tostr(typename)
+        basetype = await s_stormtypes.tostr(basetype)
+        typeopts = await s_stormtypes.toprim(typeopts)
+        typeinfo = await s_stormtypes.toprim(typeinfo)
+        s_stormtypes.confirm(('model', 'type', 'add', typename))
+        await self.runt.snap.core.addType(typename, basetype, typeopts, typeinfo)
+
+    async def delType(self, typename):
+        typename = await s_stormtypes.tostr(typename)
+        s_stormtypes.confirm(('model', 'type', 'del', typename))
+        await self.runt.snap.core.delType(typename)

synapse/lib/stormlib/scrape.py

@@ -155,10 +155,7 @@ class LibScrape(s_stormtypes.Lib):
         if fangs:
             _fangs = {src: dst for (src, dst) in fangs}
             _fangre = s_scrape.genFangRegex(_fangs)
-            if len(text) < s_scrape.SCRAPE_SPAWN_LENGTH:
-                scrape_text, offsets = s_scrape.refang_text2(text, re=_fangre, fangs=_fangs)
-            else:
-                scrape_text, offsets = await s_coro.semafork(s_scrape.refang_text2, text, re=_fangre, fangs=_fangs)
+            scrape_text, offsets = await s_coro.semafork(s_scrape.refang_text2, text, re=_fangre, fangs=_fangs)
 
         async for info in s_scrape.genMatchesAsync(scrape_text, regx, opts=opts):
             valu = info.pop('valu')

synapse/lib/stormtypes.py

@@ -7545,6 +7545,9 @@ class View(Prim):
         {'name': 'parent', 'desc': 'The parent View. Will be ``$lib.null`` if the view is not a fork.', 'type': 'str'},
         {'name': 'triggers', 'desc': 'The ``trigger`` objects associated with the ``view``.',
          'type': 'list', },
+        {'name': 'children', 'desc': 'Yield Views which are children of this View.',
+         'type': {'type': 'function', '_funcname': '_methGetChildren',
+                  'returns': {'name': 'yields', 'type': 'view', 'desc': 'Child Views.', }}},
         {'name': 'set', 'desc': '''
             Set a view configuration option.
 
@@ -7832,6 +7835,7 @@ class View(Prim):
             'merge': self._methViewMerge,
             'detach': self.detach,
             'addNode': self.addNode,
+            'children': self._methGetChildren,
             'getEdges': self._methGetEdges,
             'wipeLayer': self._methWipeLayer,
             'swapLayer': self._methSwapLayer,
@@ -7967,6 +7971,12 @@ class View(Prim):
         async for valu in view.iterPropValues(propname):
             yield valu
 
+    @stormfunc(readonly=True)
+    async def _methGetChildren(self):
+        view = self._reqView()
+        async for child in view.children():
+            yield View(self.runt, await child.pack(), path=self.path)
+
     @stormfunc(readonly=True)
     async def _methGetEdges(self, verb=None):
         verb = await toprim(verb)
@@ -9610,7 +9620,7 @@ def fromprim(valu, path=None, basetypes=True):
 
     return valu
 
-async def tostor(valu):
+async def tostor(valu, isndef=False):
 
     if isinstance(valu, Number):
         return str(valu.value())
@@ -9633,6 +9643,9 @@ async def tostor(valu):
                 pass
         return retn
 
+    if isndef and isinstance(valu, s_node.Node):
+        return valu.ndef
+
     return await toprim(valu)
 
 async def tocmprvalu(valu):
@@ -9676,6 +9689,9 @@ async def tostr(valu, noneok=False):
         if isinstance(valu, bytes):
             return valu.decode('utf8', 'surrogatepass')
 
+        if isinstance(valu, s_node.Node):
+            return valu.repr()
+
         return str(valu)
     except Exception as e:
         mesg = f'Failed to make a string from {valu!r}.'

synapse/lib/version.py

@@ -223,6 +223,6 @@ def reqVersion(valu, reqver,
 ##############################################################################
 # The following are touched during the release process by bumpversion.
 # Do not modify these directly.
-version = (2, 187, 0)
+version = (2, 188, 1)
 verstring = '.'.join([str(x) for x in version])
-commit = '5cdabb0eeea74eff019d8bcdc461b48bb5eb6651'
+commit = '2cf97aa2a3266442393dfc78525749d3f65d9fc7'

synapse/lib/view.py

@@ -1315,6 +1315,14 @@ class View(s_nexus.Pusher):  # type: ignore
 
                 todo.append(child)
 
+    async def children(self):
+        for view in list(self.core.views.values()):
+            if view.parent != self:
+                await asyncio.sleep(0)
+                continue
+
+            yield view
+
     async def insertParentFork(self, useriden, name=None):
         '''
         Insert a new View between a forked View and its parent.
@@ -1614,9 +1622,7 @@ class View(s_nexus.Pusher):  # type: ignore
         if trig is not None:
             return self.triggers.get(tdef['iden']).pack()
 
-        gate = self.core.auth.getAuthGate(tdef['iden'])
-        if gate is not None:
-            raise s_exc.DupIden(mesg='An AuthGate with this iden already exists')
+        self.core.auth.reqNoAuthGate(tdef['iden'])
 
         user = self.core.auth.user(tdef['user'])
         await self.core.getStormQuery(tdef['storm'])

synapse/models/base.py

@@ -107,6 +107,19 @@ class BaseModule(s_module.CoreModule):
 
                 ('meta:sophistication', ('int', {'enums': sophenums}), {
                     'doc': 'A sophistication score with named values: very low, low, medium, high, and very high.'}),
+
+                ('meta:aggregate:type:taxonomy', ('taxonomy', {}), {
+                    'interfaces': ('meta:taxonomy',),
+                    'doc': 'A type of item being counted in aggregate.'}),
+
+                ('meta:aggregate', ('guid', {}), {
+                    'display': {
+                        'columns': (
+                            {'type': 'prop', 'opts': {'name': 'type'}},
+                            {'type': 'prop', 'opts': {'name': 'count'}},
+                        ),
+                    },
+                    'doc': 'A node which represents an aggregate count of a specific type.'}),
             ),
             'interfaces': (
                 ('meta:taxonomy', {
@@ -285,6 +298,20 @@ class BaseModule(s_module.CoreModule):
                         'doc': 'An external identifier for the rule.'}),
                 )),
 
+                ('meta:aggregate:type:taxonomy', {}, ()),
+                ('meta:aggregate', {}, (
+
+                    ('type', ('meta:aggregate:type:taxonomy', {}), {
+                        'ex': 'casualties.civilian',
+                        'doc': 'The type of items being counted in aggregate.'}),
+
+                    ('time', ('time', {}), {
+                        'doc': 'The time that the count was computed.'}),
+
+                    ('count', ('int', {}), {
+                        'doc': 'The number of items counted in aggregate.'}),
+                )),
+
                 ('graph:cluster', {}, (
                     ('name', ('str', {'lower': True}), {
                         'doc': 'A human friendly name for the cluster.'}),

synapse/models/files.py

@@ -284,6 +284,16 @@ class FileModule(s_module.CoreModule):
                     'doc': 'A parent file that fully contains the specified child file.',
                 }),
 
+                ('file:attachment', ('guid', {}), {
+                    'display': {
+                        'columns': (
+                            {'type': 'prop', 'opts': {'name': 'name'}},
+                            {'type': 'prop', 'opts': {'name': 'file'}},
+                            {'type': 'prop', 'opts': {'name': 'text'}},
+                        ),
+                    },
+                    'doc': 'A file attachment.'}),
+
                 ('file:archive:entry', ('guid', {}), {
                     'doc': 'An archive entry representing a file and metadata within a parent archive file.'}),
 
@@ -601,6 +611,18 @@ class FileModule(s_module.CoreModule):
                     }),
                 )),
 
+                ('file:attachment', {}, (
+
+                    ('name', ('file:path', {}), {
+                        'doc': 'The name of the attached file.'}),
+
+                    ('text', ('str', {}), {
+                        'doc': 'Any text associated with the file such as alt-text for images.'}),
+
+                    ('file', ('file:bytes', {}), {
+                        'doc': 'The file which was attached.'}),
+                )),
+
                 ('file:archive:entry', {}, (
 
                     ('parent', ('file:bytes', {}), {

synapse/models/inet.py

@@ -1369,6 +1369,9 @@ class InetModule(s_module.CoreModule):
                         'doc': 'A username string.'
                     }),
 
+                    ('inet:service:object', ('ndef', {'interfaces': ('inet:service:object',)}), {
+                        'doc': 'An ndef type including all forms which implement the inet:service:object interface.'}),
+
                     ('inet:search:query', ('guid', {}), {
                         'interfaces': ('inet:service:action',),
                         'doc': 'An instance of a search query issued to a search engine.',
@@ -1530,6 +1533,14 @@ class InetModule(s_module.CoreModule):
                         'interfaces': ('inet:service:object',),
                         'doc': 'An account within a service platform. Accounts may be instance specific.'}),
 
+                    ('inet:service:relationship:type:taxonomy', ('taxonomy', {}), {
+                        'interfaces': ('meta:taxonomy',),
+                        'doc': 'A service object relationship type taxonomy.'}),
+
+                    ('inet:service:relationship', ('guid', {}), {
+                        'interfaces': ('inet:service:object',),
+                        'doc': 'A relationship between two service objects.'}),
+
                     ('inet:service:permission:type:taxonomy', ('taxonomy', {}), {
                         'interfaces': ('meta:taxonomy',),
                         'doc': 'A permission type taxonomy.'}),
@@ -1588,6 +1599,10 @@ class InetModule(s_module.CoreModule):
                         'interfaces': ('meta:taxonomy',),
                         'doc': 'A message type taxonomy.'}),
 
+                    ('inet:service:emote', ('guid', {}), {
+                        'interfaces': ('inet:service:object',),
+                        'doc': 'An emote or reaction by an account.'}),
+
                     ('inet:service:access', ('guid', {}), {
                         'interfaces': ('inet:service:action',),
                         'doc': 'Represents a user access request to a service resource.'}),
@@ -2015,8 +2030,11 @@ class InetModule(s_module.CoreModule):
                             'doc': 'The guid of the destination process.'
                         }),
                         ('dst:exe', ('file:bytes', {}), {
-                            'doc': 'The file (executable) that received the connection.'
-                        }),
+                            'doc': 'The file (executable) that received the connection.'}),
+
+                        ('dst:txfiles', ('array', {'type': 'file:attachment', 'sorted': True, 'uniq': True}), {
+                            'doc': 'An array of files sent by the destination host.'}),
+
                         ('dst:txcount', ('int', {}), {
                             'doc': 'The number of packets sent by the destination host.'
                         }),
@@ -2049,8 +2067,11 @@ class InetModule(s_module.CoreModule):
                             'doc': 'The guid of the source process.'
                         }),
                         ('src:exe', ('file:bytes', {}), {
-                            'doc': 'The file (executable) that created the connection.'
-                        }),
+                            'doc': 'The file (executable) that created the connection.'}),
+
+                        ('src:txfiles', ('array', {'type': 'file:attachment', 'sorted': True, 'uniq': True}), {
+                            'doc': 'An array of files sent by the source host.'}),
+
                         ('src:txcount', ('int', {}), {
                             'doc': 'The number of packets sent by the source host.'
                         }),
@@ -3586,6 +3607,20 @@ class InetModule(s_module.CoreModule):
                             'doc': 'Current profile details associated with the account.'}),
                     )),
 
+                    ('inet:service:relationship:type:taxonomy', {}, ()),
+                    ('inet:service:relationship', {}, (
+
+                        ('source', ('inet:service:object', {}), {
+                            'doc': 'The source object.'}),
+
+                        ('target', ('inet:service:object', {}), {
+                            'doc': 'The target object.'}),
+
+                        ('type', ('inet:service:relationship:type:taxonomy', {}), {
+                            'ex': 'follows',
+                            'doc': 'The type of relationship between the source and the target.'}),
+                    )),
+
                     ('inet:service:group', {}, ( # inet:service:object
 
                         ('id', ('str', {'strip': True}), {
@@ -3743,6 +3778,16 @@ class InetModule(s_module.CoreModule):
                             'doc': 'The file which was attached to the message.'}),
                     )),
 
+                    ('inet:service:emote', {}, (
+
+                        ('about', ('inet:service:object', {}), {
+                            'doc': 'The node that the emote is about.'}),
+
+                        ('text', ('str', {'strip': True}), {
+                            'ex': ':partyparrot:',
+                            'doc': 'The unicode or emote text of the reaction.'}),
+                    )),
+
                     ('inet:service:channel', {}, (
 
                         ('name', ('str', {'onespace': True, 'lower': True}), {