Merge develop into main

.gitignore

@@ -166,7 +166,7 @@ cython_debug/
 #  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
-#.idea/
+.idea/
 
 # Ruff stuff:
 .ruff_cache/

.idea/.gitignore

@@ -1,8 +0,0 @@
-# 默认忽略的文件
-/shelf/
-/workspace.xml
-# 基于编辑器的 HTTP 客户端请求
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml

.idea/blog.iml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4">
-  <component name="PackageRequirementsSettings">
-    <option name="modifyBaseFiles" value="true" />
-  </component>
-</module>

.idea/inspectionProfiles/profiles_settings.xml

@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="USE_PROJECT_PROFILE" value="false" />
-    <version value="1.0" />
-  </settings>
-</component>

.idea/misc.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Black">
-    <option name="sdkName" value="Python 3.12 (blog) (2)" />
-  </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.12 (blog) (2)" project-jdk-type="Python SDK" />
-</project>

.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/blog.iml" filepath="$PROJECT_DIR$/.idea/blog.iml" />
-    </modules>
-  </component>
-</project>

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>

init.txt

@@ -1 +1 @@
-init feature/base-view branch
+git test

myblog/blog/models.py

@@ -18,6 +18,7 @@ class Post(models.Model):
 
     def get_markdown_content(self):
         import re
+        import emoji
         content = self.content
         media_url = settings.MEDIA_URL.rstrip('/')
 
@@ -60,4 +61,10 @@ class Post(models.Model):
             content
         )
 
-        return mark_safe(markdown.markdown(content))
+        # 先转换markdown到HTML
+        html_content = markdown.markdown(content)
+        
+        # 将emoji shortcode转换为实际的emoji字符
+        html_content = emoji.emojize(html_content, language='alias')
+        
+        return mark_safe(html_content)

myblog/blog/templates/blog/detail.html

@@ -24,6 +24,30 @@
                 display: block;
                 margin: 10px 0;
             }
+            
+            .post-content pre {
+                background-color: #f4f4f4;
+                border: 1px solid #ddd;
+                border-radius: 4px;
+                padding: 10px;
+                overflow-x: auto;
+                margin: 10px 0;
+            }
+            
+            .post-content code {
+                font-family: 'Courier New', Courier, monospace;
+                background-color: #f4f4f4;
+                padding: 2px 4px;
+                border-radius: 3px;
+                font-size: 0.9em;
+            }
+            
+            .post-content pre code {
+                background-color: transparent;
+                padding: 0;
+                border-radius: 0;
+                font-size: 0.9em;
+            }
         </style>
         <div class="post-content">{{ post.get_markdown_content }}</div>
     </div>

requirements.txt

@@ -15,7 +15,7 @@ idna==3.10
 ipython==9.4.0
 ipython_pygments_lexers==1.1.1
 jedi==0.19.2
-Markdown==3.8.2
+Markdown
 martor==1.6.45
 matplotlib-inline==0.1.7
 numpy==2.3.2