Просмотр исходного кода

Small fix in messages parser, support for emojis.

Ralfp 12 лет назад
Родитель
Сommit
830bccd8bd

+ 1 - 0
.gitignore

@@ -190,4 +190,5 @@ yaml/**
 dev-manage.py
 path.py
 !templates/debug_toolbar/panels/acl.html
+static/emojis/**
 templates/debug_toolbar/**

+ 1 - 1
misago/markdown/extensions/cleanlinks.py

@@ -27,7 +27,7 @@ class CleanLinksTreeprocessor(markdown.treeprocessors.Treeprocessor):
                 node.set('src', '%s' % clean_inner(node.get('src')))
 
         try:
-            if self.inurl and is_url(node.text) and is_inner(node.text):
+            if self.inurl and node.text and is_url(node.text) and is_inner(node.text):
                 node.text = clean_inner(node.text)[1:]
         except TypeError:
             pass

+ 193 - 0
misago/markdown/extensions/emoji.py

@@ -0,0 +1,193 @@
+import markdown
+from markdown.inlinepatterns import SubstituteTagPattern
+from markdown.util import etree
+from django.conf import settings
+from django.utils.translation import ugettext_lazy as _
+
+EMOJIS = (
+    '+1', '-1', '100', '1234', '8ball', 'a', 'ab', 'abc', 'abcd', 'accept',
+    'aerial_tramway', 'airplane', 'alarm_clock', 'alien', 'ambulance',
+    'anchor', 'angel', 'anger', 'angry', 'anguished', 'ant', 'apple',
+    'aquarius', 'aries', 'arrows_clockwise', 'arrows_counterclockwise',
+    'arrow_backward', 'arrow_double_down', 'arrow_double_up', 'arrow_down',
+    'arrow_down_small', 'arrow_forward', 'arrow_heading_down',
+    'arrow_heading_up', 'arrow_left', 'arrow_lower_left', 'arrow_lower_right',
+    'arrow_right', 'arrow_right_hook', 'arrow_up', 'arrow_upper_left',
+    'arrow_upper_right', 'arrow_up_down', 'arrow_up_small', 'art',
+    'articulated_lorry', 'astonished', 'atm', 'b', 'baby', 'baby_bottle',
+    'baby_chick', 'baby_symbol', 'baggage_claim', 'balloon',
+    'ballot_box_with_check', 'bamboo', 'banana', 'bangbang', 'bank', 'barber',
+    'bar_chart', 'baseball', 'basketball', 'bath', 'bathtub', 'battery',
+    'bear', 'bee', 'beer', 'beers', 'beetle', 'beginner', 'bell', 'bento',
+    'bicyclist', 'bike', 'bikini', 'bird', 'birthday', 'black_circle',
+    'black_joker', 'black_nib', 'black_square', 'black_square_button',
+    'blossom', 'blowfish', 'blue_book', 'blue_car', 'blue_heart', 'blush',
+    'boar', 'boat', 'bomb', 'book', 'bookmark', 'bookmark_tabs', 'books',
+    'boom', 'boot', 'bouquet', 'bow', 'bowling', 'bowtie', 'boy', 'bread',
+    'bride_with_veil', 'bridge_at_night', 'briefcase', 'broken_heart', 'bug',
+    'bulb', 'bullettrain_front', 'bullettrain_side', 'bus', 'busstop',
+    'busts_in_silhouette', 'bust_in_silhouette', 'cactus', 'cake', 'calendar',
+    'calling', 'camel', 'camera', 'cancer', 'candy', 'capital_abcd',
+    'capricorn', 'car', 'card_index', 'carousel_horse', 'cat', 'cat2', 'cd',
+    'chart', 'chart_with_downwards_trend', 'chart_with_upwards_trend',
+    'checkered_flag', 'cherries', 'cherry_blossom', 'chestnut', 'chicken',
+    'children_crossing', 'chocolate_bar', 'christmas_tree', 'church', 'cinema',
+    'circus_tent', 'city_sunrise', 'city_sunset', 'cl', 'clap', 'clapper',
+    'clipboard', 'clock1', 'clock10', 'clock1030', 'clock11', 'clock1130',
+    'clock12', 'clock1230', 'clock130', 'clock2', 'clock230', 'clock3',
+    'clock330', 'clock4', 'clock430', 'clock5', 'clock530', 'clock6',
+    'clock630', 'clock7', 'clock730', 'clock8', 'clock830', 'clock9',
+    'clock930', 'closed_book', 'closed_lock_with_key', 'closed_umbrella',
+    'cloud', 'clubs', 'cn', 'cocktail', 'coffee', 'cold_sweat', 'collision',
+    'computer', 'confetti_ball', 'confounded', 'confused', 'congratulations',
+    'construction', 'construction_worker', 'convenience_store', 'cookie',
+    'cool', 'cop', 'copyright', 'corn', 'couple', 'couplekiss',
+    'couple_with_heart', 'cow', 'cow2', 'credit_card', 'crocodile',
+    'crossed_flags', 'crown', 'cry', 'crying_cat_face', 'crystal_ball',
+    'cupid', 'curly_loop', 'currency_exchange', 'curry', 'custard', 'customs',
+    'cyclone', 'dancer', 'dancers', 'dango', 'dart', 'dash', 'date', 'de',
+    'deciduous_tree', 'department_store', 'diamonds',
+    'diamond_shape_with_a_dot_inside', 'disappointed', 'disappointed_relieved',
+    'dizzy', 'dizzy_face', 'dog', 'dog2', 'dollar', 'dolls', 'dolphin', 'door',
+    'doughnut', 'do_not_litter', 'dragon', 'dragon_face', 'dress',
+    'dromedary_camel', 'droplet', 'dvd', 'e-mail', 'ear', 'earth_africa',
+    'earth_americas', 'earth_asia', 'ear_of_rice', 'egg', 'eggplant', 'eight',
+    'eight_pointed_black_star', 'eight_spoked_asterisk', 'electric_plug',
+    'elephant', 'email', 'end', 'envelope', 'es', 'euro', 'european_castle',
+    'european_post_office', 'evergreen_tree', 'exclamation', 'expressionless',
+    'eyeglasses', 'eyes', 'facepunch', 'factory', 'fallen_leaf', 'family',
+    'fast_forward', 'fax', 'fearful', 'feelsgood', 'feet', 'ferris_wheel',
+    'file_folder', 'finnadie', 'fire', 'fireworks', 'fire_engine',
+    'first_quarter_moon', 'first_quarter_moon_with_face', 'fish',
+    'fishing_pole_and_fish', 'fish_cake', 'fist', 'five', 'flags',
+    'flashlight', 'floppy_disk', 'flower_playing_cards', 'flushed', 'foggy',
+    'football', 'fork_and_knife', 'fountain', 'four', 'four_leaf_clover', 'fr',
+    'free', 'fried_shrimp', 'fries', 'frog', 'frowning', 'fu', 'fuelpump',
+    'full_moon', 'full_moon_with_face', 'game_die', 'gb', 'gem', 'gemini',
+    'ghost', 'gift', 'gift_heart', 'girl', 'globe_with_meridians', 'goat',
+    'goberserk', 'godmode', 'golf', 'grapes', 'green_apple', 'green_book',
+    'green_heart', 'grey_exclamation', 'grey_question', 'grimacing', 'grin',
+    'grinning', 'guardsman', 'guitar', 'gun', 'haircut', 'hamburger', 'hammer',
+    'hamster', 'hand', 'handbag', 'hankey', 'hash', 'hatched_chick',
+    'hatching_chick', 'headphones', 'heart', 'heartbeat', 'heartpulse',
+    'hearts', 'heart_decoration', 'heart_eyes', 'heart_eyes_cat',
+    'hear_no_evil', 'heavy_check_mark', 'heavy_division_sign',
+    'heavy_dollar_sign', 'heavy_exclamation_mark', 'heavy_minus_sign',
+    'heavy_multiplication_x', 'heavy_plus_sign', 'helicopter', 'herb',
+    'hibiscus', 'high_brightness', 'high_heel', 'hocho', 'honeybee',
+    'honey_pot', 'horse', 'horse_racing', 'hospital', 'hotel', 'hotsprings',
+    'hourglass', 'hourglass_flowing_sand', 'house', 'house_with_garden',
+    'hurtrealbad', 'hushed', 'icecream', 'ice_cream', 'id',
+    'ideograph_advantage', 'imp', 'inbox_tray', 'incoming_envelope',
+    'information_desk_person', 'information_source', 'innocent', 'interrobang',
+    'iphone', 'it', 'izakaya_lantern', 'jack_o_lantern', 'japan',
+    'japanese_castle', 'japanese_goblin', 'japanese_ogre', 'jeans', 'joy',
+    'joy_cat', 'jp', 'key', 'keycap_ten', 'kimono', 'kiss', 'kissing',
+    'kissing_cat', 'kissing_closed_eyes', 'kissing_face', 'kissing_heart',
+    'kissing_smiling_eyes', 'koala', 'koko', 'kr', 'large_blue_circle',
+    'large_blue_diamond', 'large_orange_diamond', 'last_quarter_moon',
+    'last_quarter_moon_with_face', 'laughing', 'leaves', 'ledger',
+    'leftwards_arrow_with_hook', 'left_luggage', 'left_right_arrow', 'lemon',
+    'leo', 'leopard', 'libra', 'light_rail', 'link', 'lips', 'lipstick',
+    'lock', 'lock_with_ink_pen', 'lollipop', 'loop', 'loudspeaker',
+    'love_hotel', 'love_letter', 'low_brightness', 'm', 'mag', 'mag_right',
+    'mahjong', 'mailbox', 'mailbox_closed', 'mailbox_with_mail',
+    'mailbox_with_no_mail', 'man', 'mans_shoe', 'man_with_gua_pi_mao',
+    'man_with_turban', 'maple_leaf', 'mask', 'massage', 'meat_on_bone', 'mega',
+    'melon', 'memo', 'mens', 'metal', 'metro', 'microphone', 'microscope',
+    'milky_way', 'minibus', 'minidisc', 'mobile_phone_off', 'moneybag',
+    'money_with_wings', 'monkey', 'monkey_face', 'monorail', 'moon',
+    'mortar_board', 'mountain_bicyclist', 'mountain_cableway',
+    'mountain_railway', 'mount_fuji', 'mouse', 'mouse2', 'movie_camera',
+    'moyai', 'muscle', 'mushroom', 'musical_keyboard', 'musical_note',
+    'musical_score', 'mute', 'nail_care', 'name_badge', 'neckbeard', 'necktie',
+    'negative_squared_cross_mark', 'neutral_face', 'new', 'newspaper',
+    'new_moon', 'new_moon_with_face', 'ng', 'nine', 'non-potable_water',
+    'nose', 'notebook', 'notebook_with_decorative_cover', 'notes', 'no_bell',
+    'no_bicycles', 'no_entry', 'no_entry_sign', 'no_good', 'no_mobile_phones',
+    'no_mouth', 'no_pedestrians', 'no_smoking', 'nut_and_bolt', 'o', 'o2',
+    'ocean', 'octocat', 'octopus', 'oden', 'office', 'ok', 'ok_hand',
+    'ok_woman', 'older_man', 'older_woman', 'on', 'oncoming_automobile',
+    'oncoming_bus', 'oncoming_police_car', 'oncoming_taxi', 'one',
+    'open_file_folder', 'open_hands', 'open_mouth', 'ophiuchus', 'orange_book',
+    'outbox_tray', 'ox', 'pager', 'page_facing_up', 'page_with_curl',
+    'palm_tree', 'panda_face', 'paperclip', 'parking', 'partly_sunny',
+    'part_alternation_mark', 'passport_control', 'paw_prints', 'peach', 'pear',
+    'pencil', 'pencil2', 'penguin', 'pensive', 'performing_arts', 'persevere',
+    'person_frowning', 'person_with_blond_hair', 'person_with_pouting_face',
+    'phone', 'pig', 'pig2', 'pig_nose', 'pill', 'pineapple', 'pisces', 'pizza',
+    'plus1', 'point_down', 'point_left', 'point_right', 'point_up',
+    'point_up_2', 'police_car', 'poodle', 'poop', 'postal_horn', 'postbox',
+    'post_office', 'potable_water', 'pouch', 'poultry_leg', 'pound',
+    'pouting_cat', 'pray', 'princess', 'punch', 'purple_heart', 'purse',
+    'pushpin', 'put_litter_in_its_place', 'question', 'rabbit', 'rabbit2',
+    'racehorse', 'radio', 'radio_button', 'rage', 'rage1', 'rage2', 'rage3',
+    'rage4', 'railway_car', 'rainbow', 'raised_hand', 'raised_hands',
+    'raising_hand', 'ram', 'ramen', 'rat', 'recycle', 'red_car', 'red_circle',
+    'registered', 'relaxed', 'relieved', 'repeat', 'repeat_one', 'restroom',
+    'revolving_hearts', 'rewind', 'ribbon', 'rice', 'rice_ball',
+    'rice_cracker', 'rice_scene', 'ring', 'rocket', 'roller_coaster',
+    'rooster', 'rose', 'rotating_light', 'round_pushpin', 'rowboat', 'ru',
+    'rugby_football', 'runner', 'running', 'running_shirt_with_sash', 'sa',
+    'sagittarius', 'sailboat', 'sake', 'sandal', 'santa', 'satellite',
+    'satisfied', 'saxophone', 'school', 'school_satchel', 'scissors',
+    'scorpius', 'scream', 'scream_cat', 'scroll', 'seat', 'secret', 'seedling',
+    'see_no_evil', 'seven', 'shaved_ice', 'sheep', 'shell', 'ship', 'shipit',
+    'shirt', 'shit', 'shoe', 'shower', 'signal_strength', 'six',
+    'six_pointed_star', 'ski', 'skull', 'sleeping', 'sleepy', 'slot_machine',
+    'small_blue_diamond', 'small_orange_diamond', 'small_red_triangle',
+    'small_red_triangle_down', 'smile', 'smiley', 'smiley_cat', 'smile_cat',
+    'smiling_imp', 'smirk', 'smirk_cat', 'smoking', 'snail', 'snake',
+    'snowboarder', 'snowflake', 'snowman', 'sob', 'soccer', 'soon', 'sos',
+    'sound', 'space_invader', 'spades', 'spaghetti', 'sparkler', 'sparkles',
+    'sparkling_heart', 'speaker', 'speak_no_evil', 'speech_balloon',
+    'speedboat', 'squirrel', 'star', 'star2', 'stars', 'station',
+    'statue_of_liberty', 'steam_locomotive', 'stew', 'straight_ruler',
+    'strawberry', 'stuck_out_tongue', 'stuck_out_tongue_closed_eyes',
+    'stuck_out_tongue_winking_eye', 'sunflower', 'sunglasses', 'sunny',
+    'sunrise', 'sunrise_over_mountains', 'sun_with_face', 'surfer', 'sushi',
+    'suspect', 'suspension_railway', 'sweat', 'sweat_drops', 'sweat_smile',
+    'sweet_potato', 'swimmer', 'symbols', 'syringe', 'tada', 'tanabata_tree',
+    'tangerine', 'taurus', 'taxi', 'tea', 'telephone', 'telephone_receiver',
+    'telescope', 'tennis', 'tent', 'thought_balloon', 'three', 'thumbsdown',
+    'thumbsup', 'ticket', 'tiger', 'tiger2', 'tired_face', 'tm', 'toilet',
+    'tokyo_tower', 'tomato', 'tongue', 'top', 'tophat', 'tractor',
+    'traffic_light', 'train', 'train2', 'tram', 'triangular_flag_on_post',
+    'triangular_ruler', 'trident', 'triumph', 'trolleybus', 'trollface',
+    'trophy', 'tropical_drink', 'tropical_fish', 'truck', 'trumpet', 'tshirt',
+    'tulip', 'turtle', 'tv', 'twisted_rightwards_arrows', 'two', 'two_hearts',
+    'two_men_holding_hands', 'two_women_holding_hands', 'u5272', 'u5408',
+    'u55b6', 'u6307', 'u6708', 'u6709', 'u6e80', 'u7121', 'u7533', 'u7981',
+    'u7a7a', 'uk', 'umbrella', 'unamused', 'underage', 'unlock', 'up', 'us',
+    'v', 'vertical_traffic_light', 'vhs', 'vibration_mode', 'video_camera',
+    'video_game', 'violin', 'virgo', 'volcano', 'vs', 'walking',
+    'waning_crescent_moon', 'waning_gibbous_moon', 'warning', 'watch',
+    'watermelon', 'water_buffalo', 'wave', 'wavy_dash', 'waxing_crescent_moon',
+    'waxing_gibbous_moon', 'wc', 'weary', 'wedding', 'whale', 'whale2',
+    'wheelchair', 'white_check_mark', 'white_circle', 'white_flower',
+    'white_square', 'white_square_button', 'wind_chime', 'wine_glass', 'wink',
+    'wolf', 'woman', 'womans_clothes', 'womans_hat', 'womens', 'worried',
+    'wrench', 'x', 'yellow_heart', 'yen', 'yum', 'zap', 'zero', 'zzz',
+)
+
+
+class EmojiPattern(SubstituteTagPattern):
+    def __init__ (self, emo):
+        super(SubstituteTagPattern, self).__init__(r':%s:' % emo, '')
+        self.emo = emo
+
+    def handleMatch (self, m):
+        element = etree.Element('img')
+        element.set('class', 'emoji')
+        element.set('alt', ':%s:' % self.emo)
+        element.set('src', '%semojis/%s.png' % (settings.STATIC_URL, self.emo))
+        return element
+
+
+class EmojiExtension(markdown.Extension):
+    def extendMarkdown(self, md):
+        md.registerExtension(self)
+        for emo in EMOJIS:
+            md.inlinePatterns.add('mi_emoji_%s' % emo,
+                                  EmojiPattern(emo),
+                                  '_end')

+ 4 - 0
misago/markdown/factory.py

@@ -5,6 +5,7 @@ from django.utils.importlib import import_module
 from django.utils.translation import ugettext_lazy as _
 from misago.utils.strings import random_string
 from misago.markdown.extensions.cleanlinks import CleanLinksExtension
+from misago.markdown.extensions.emoji import EmojiExtension
 from misago.markdown.parsers import RemoveHTMLParser
 
 def clear_markdown(text):
@@ -36,6 +37,9 @@ def signature_markdown(acl, text):
         del md.inlinePatterns['autolink']
     if not acl.usercp.allow_signature_images():
         del md.inlinePatterns['image_link']
+    else:
+        emojis = EmojiExtension()
+        emojis.extendMarkdown(md)
 
     del md.parser.blockprocessors['hashheader']
     del md.parser.blockprocessors['setextheader']

+ 15 - 2
misago/markdown/parsers.py

@@ -8,7 +8,7 @@ class RemoveHTMLParser(HTMLParser):
         HTMLParser.__init__(self)
         self.clean_text = ''
         self.lookback = []
-        
+
     def handle_entityref(self, name):
         if name == 'gt':
             self.clean_text += '>'
@@ -16,7 +16,10 @@ class RemoveHTMLParser(HTMLParser):
             self.clean_text += '<'
 
     def handle_starttag(self, tag, attrs):
-        self.lookback.append(tag)
+        if tag == 'img':
+            self.handle_startendtag(tag, attrs)
+        else:
+            self.lookback.append(tag)
 
     def handle_endtag(self, tag):
         try:
@@ -24,6 +27,16 @@ class RemoveHTMLParser(HTMLParser):
                 self.lookback.pop()
         except IndexError:
             pass
+
+    def handle_startendtag(self, tag, attrs):
+        try:
+            if tag == 'img':
+                for attr in attrs:
+                    if attr[0] == 'alt':
+                        self.clean_text += attr[1]
+                        break
+        except KeyError:
+            pass
         
     def handle_data(self, data):
         # String does not repeat itself

+ 11 - 4
static/cranefly/css/cranefly.css

@@ -944,10 +944,10 @@ a.btn-link:hover,a.btn-link:active,a.btn-link:focus{opacity:0.9;filter:alpha(opa
 .error-page .error-protips a:hover,.error-page .error-protips a:active{opacity:1;filter:alpha(opacity=100);}
 .markdown{margin:0px;overflow:auto;}.markdown>:first-child{margin-top:0px;}
 .markdown>:last-child{margin-bottom:0px;}
-.markdown h1{font-size:28px;}
-.markdown h2{font-size:23.8px;}
-.markdown h3{font-size:21px;}
-.markdown h4{font-size:16.8px;}
+.markdown h1{font-size:23.8px;}
+.markdown h2{font-size:21px;}
+.markdown h3{font-size:16.8px;}
+.markdown h4{font-size:14px;}
 .markdown hr{border:none;border-top:1px solid #eeeeee;margin:20px 0px;}
 .markdown blockquote{background-color:#fcfcfc;border:1px solid #f0f0f0;border-radius:3px;padding:14px;}.markdown blockquote>h3:first-child{margin:0px;margin-bottom:10px;padding:0px;font-size:14px;line-height:20px;}
 .markdown blockquote>:first-child{margin-top:0px;}
@@ -959,6 +959,13 @@ a.btn-link:hover,a.btn-link:active,a.btn-link:focus{opacity:0.9;filter:alpha(opa
 .markdown img{background-color:#ffffff;border-radius:3px;margin:10px 0px;}
 .markdown pre,.markdown blockquote,.markdown iframe{margin-top:20px;margin-bottom:20px;}.markdown pre>:first-child,.markdown blockquote>:first-child,.markdown iframe>:first-child{margin-top:0px;}
 .markdown pre>:last-child,.markdown blockquote>:last-child,.markdown iframe>:last-child{margin-bottom:0px;}
+.markdown .emoji{background:none;border-radius:0px;margin:0px;vertical-align:middle;}
+.markdown h1 .emoji{width:27.8px;height:27.8px;}
+.markdown h2 .emoji{width:25px;height:25px;}
+.markdown h3 .emoji{width:20.8px;height:20.8px;}
+.markdown h4 .emoji{width:18px;height:18px;}
+.markdown p .emoji{width:18px;height:18px;}
+.markdown blockquote p .emoji{width:13.9px;height:13.9px;}
 .index-sidebar{position:relative;bottom:9px;}
 .index-category{background-color:#ffffff;border:1px solid #d5d5d5;border-radius:2px;-webkit-box-shadow:0px 0px 0px 3px #eeeeee;-moz-box-shadow:0px 0px 0px 3px #eeeeee;box-shadow:0px 0px 0px 3px #eeeeee;margin-bottom:20px;}.index-category table{margin:0px;}.index-category table caption{background-color:#fbfbfb;border:1px solid #d5d5d5;border-radius:2px 2px 0px 0px;margin:-1px;padding:3.966666666666667px 9.9px;color:#333333;font-size:11.9px;font-weight:bold;text-align:left;}.index-category table caption small{margin-left:7px;color:#999999;font-size:11.9px;}
 .index-category table td{padding:14.75px 9.9px;padding-bottom:15.75px;}

+ 56 - 4
static/cranefly/css/cranefly/markdown.less

@@ -14,19 +14,19 @@
   }
 
   h1 {
-    font-size: @baseFontSize * 2;
+    font-size: @baseFontSize * 1.7;
   }
 
   h2 {
-    font-size: @baseFontSize * 1.7;
+    font-size: @baseFontSize * 1.5;
   }
 
   h3 {
-    font-size: @baseFontSize * 1.5;
+    font-size: @baseFontSize * 1.2;
   }
 
   h4 {
-    font-size: @baseFontSize * 1.2;
+    font-size: @baseFontSize;
   }
 
   hr {
@@ -111,4 +111,56 @@
       margin-bottom: 0px;
     }
   }
+
+  // Emoticons
+  .emoji {
+    background: none;
+    border-radius: 0px;
+    margin: 0px;
+    vertical-align: middle;
+  }
+
+  h1 {
+    .emoji {
+      width: (@baseFontSize * 1.7) + 4px;
+      height: (@baseFontSize * 1.7) + 4px;
+    }
+  }
+
+  h2 {
+    .emoji {
+      width: (@baseFontSize * 1.5) + 4px;
+      height: (@baseFontSize * 1.5) + 4px;
+    }
+  }
+
+  h3 {
+    .emoji {
+      width: (@baseFontSize * 1.2) + 4px;
+      height: (@baseFontSize * 1.2) + 4px;
+    }
+  }
+
+  h4 {
+    .emoji {
+      width: @baseFontSize + 4px;
+      height: @baseFontSize + 4px;
+    }
+  }
+
+  p {
+    .emoji {
+      width: @baseFontSize + 4px;
+      height: @baseFontSize + 4px;
+    }
+  }
+
+  blockquote {
+    p {
+      .emoji {
+        width: @fontSizeSmall + 2px;
+        height: @fontSizeSmall + 2px;
+      }
+    }
+  }
 }

+ 1 - 1
static/cranefly/js/cranefly.js

@@ -74,7 +74,7 @@ $(function () {
 function EnhancePostsMD() {
   $(function () {
     // Add labels to images
-    $('.markdown.js-extra img').each(function() {
+    $('.markdown.js-extra img').not('.emoji').each(function() {
       $(this).addClass('img-rounded');
       $(this).attr('title', $(this).attr('alt'));
       $(this).tooltip({placement: 'top', container: 'body'});